[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm@xxxxxxxxxxxxxx]

commit 2e334d90a655a1047a9caf5ecadd9f0065f2eaab
Merge: ff649ec fea93ab
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 15 08:19:44 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 src/or/routerparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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