Merge branch 'jennifer/trp-devel' of repository.project-moonshot.org:/srv/git/trust_r...
authorJennifer Richards <jennifer@painless-security.com>
Fri, 2 Sep 2016 23:57:49 +0000 (19:57 -0400)
committerJennifer Richards <jennifer@painless-security.com>
Fri, 2 Sep 2016 23:57:49 +0000 (19:57 -0400)
commitaa493148f65b196e380af5c41a16fbe2d50da73f
tree39b407d5cd8822a48e9b73c99023fecf6c40838f
parent3f50ccf9b92f2ce6d617c671f18a39ac79615c76
parent96ae836e4797b638a20d831d6f669d459326bba1
Merge branch 'jennifer/trp-devel' of repository.project-moonshot.org:/srv/git/trust_router into jennifer/trp-devel

Conflicts:
common/tr_config.c