]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'andrea/ticket12585_v3'
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Jan 2015 17:50:55 +0000 (12:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Jan 2015 17:50:55 +0000 (12:50 -0500)
1  2 
doc/tor.1.txt
src/or/config.c
src/or/main.c
src/or/or.h
src/or/relay.c

diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/config.c
Simple merge
diff --cc src/or/main.c
Simple merge
diff --cc src/or/or.h
Simple merge
diff --cc src/or/relay.c
Simple merge