[tor-commits] [tor/master] Merge branch 'feature2553-v4-rebased'
nickm at torproject.org
nickm at torproject.org
Wed Nov 30 19:56:18 UTC 2011
commit d04f21bf394eb9e1781a89d9827476e13cc11086
Merge: 3b88b63 db648fe
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Nov 30 14:54:33 2011 -0500
Merge branch 'feature2553-v4-rebased'
configure.in | 7 +++++++
doc/tor.1.txt | 7 +++++++
src/or/circuituse.c | 6 ++++++
src/or/config.c | 41 +++++++++++++++++++++++++++++++++++++++++
src/or/connection_edge.c | 10 ++++++++++
src/or/directory.c | 4 ++++
src/or/main.c | 5 +++++
src/or/or.h | 9 +++++++++
src/or/rendclient.c | 10 +++++++++-
src/or/rendservice.c | 6 ++++++
10 files changed, 104 insertions(+), 1 deletions(-)
More information about the tor-commits
mailing list