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

[nickm@xxxxxxxxxxxxxx]

commit acb43c0735af8a7cd9e8eb57bb8835b11a90a1be
Merge: c93f66b ec7ffed
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 1 17:24:08 2013 -0500

    Merge remote-tracking branch 'public/feature7706'

 changes/feature7706 |    9 +++++++++
 doc/tor.1.txt       |   14 +++++++++++++-
 src/or/config.c     |   13 +++++++++++++
 src/or/or.h         |    5 +++++
 src/or/routerset.c  |   39 +++++++++++++++++++++++++++++++++++++++
 src/or/routerset.h  |    1 +
 6 files changed, 80 insertions(+), 1 deletions(-)

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