projects / trust_router.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f50ccf 96ae836)
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)
Conflicts:
common/tr_config.c


Trivial merge
Moonshot Trust Router