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

[nickm@xxxxxxxxxxxxxx]

commit 4c21d4ef7ac0ba0b20ee60322ce177c5f965dc0e
Merge: aa5af6a ec9c6d7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jun 28 14:03:23 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug21507     | 5 +++++
 src/or/routerparse.c | 2 ++
 2 files changed, 7 insertions(+)




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