From: Margaret Wasserman <mrw@painless-security.com>
Date: Tue, 23 Sep 2014 01:36:16 +0000 (-0400)
Subject: Merge branch 'tr-peering' of moonshot.suchdamage.org:/srv/git/trust_router into tr... 
X-Git-Tag: 1.4~3
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=bb5e8a5a1adecc80f625aedd206b96f6270dd79b

Merge branch 'tr-peering' of moonshot.suchdamage.org:/srv/git/trust_router into tr-peering
---

bb5e8a5a1adecc80f625aedd206b96f6270dd79b