[tor-commits] [tor/master] Merge branch 'bug18133_027' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit fdb57db581d4510b621fba087d9a7979934ea871
Merge: e247093 4093f34
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Apr 1 08:17:56 2016 -0400

    Merge branch 'bug18133_027' into maint-0.2.8

 changes/bug18133    | 4 ++++
 src/or/routerkeys.c | 4 ++++
 2 files changed, 8 insertions(+)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits