[tor-commits] [tor/master] Merge remote-tracking branch 'sysrqb/bug12573'

[nickm@xxxxxxxxxxxxxx]

commit f74a932e0b68205b180c6894b036ab3193144390
Merge: e669e91 43bba95
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 16 15:38:10 2014 +0200

    Merge remote-tracking branch 'sysrqb/bug12573'

 changes/bug12573 |    5 +++++
 src/or/dirserv.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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