[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature7706'
nickm at torproject.org
nickm at torproject.org
Fri Feb 1 22:25:08 UTC 2013
commit acb43c0735af8a7cd9e8eb57bb8835b11a90a1be
Merge: c93f66b ec7ffed
Author: Nick Mathewson <nickm at torproject.org>
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(-)
More information about the tor-commits
mailing list