[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11200'

[nickm@xxxxxxxxxxxxxx]

commit 66833311eb5bf717c55637093ec769588a54c11e
Merge: 830492f d01cf18
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Apr 23 11:07:52 2014 -0400

    Merge remote-tracking branch 'public/bug11200'

 changes/bug11200       |    5 +++++
 src/or/networkstatus.c |    8 ++++++++
 2 files changed, 13 insertions(+)

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