Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router
authorSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 11 Mar 2015 17:31:36 +0000 (13:31 -0400)
commit3f2f7c0b61b33e22ca937809e5a80e68c7490609
treeab93727b58790ed406bc53a43c5c758ac8b1742d
parentb053e7df22a09a2ff83c63d72519bb125b8a9575
parent9621108c0f2e4be514d461fe65c57cd006b174fd
Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router

Pull in two additional fixes from Adam.
tid/example/tids_main.c
tr/tr_main.c