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

[nickm@xxxxxxxxxxxxxx]

commit 7ed7d0571404ebd91698cc3f255d6aa1e547dfff
Merge: 2b2a44a 38e3f91
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Nov 8 07:12:07 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20597   | 5 +++++
 src/or/directory.c | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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