[tor-commits] [tor/master] Merge branch 'bug16539'

[nickm@xxxxxxxxxxxxxx]

commit 6b2696296640585bb6247ff6c88570c38b4b25a8
Merge: 2088b3b 9deb3c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 12 13:35:53 2015 -0400

    Merge branch 'bug16539'

 changes/bug16539    |    4 ++++
 src/or/routerlist.c |    2 ++
 2 files changed, 6 insertions(+)

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