]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commitd8b7dcca8de8894c147571dd3e259f00a708e348
tree2ed308a140363a95b1070756b6c081b8185403ad
parent732c885b32477513b6ef374620dec32c54eb2d9c
parent066acaf6b9e5c38fc392e85c14457f338d3c1dff
Merge remote-tracking branch 'andrea/ticket12585_v3'
doc/tor.1.txt
src/or/config.c
src/or/main.c
src/or/or.h
src/or/relay.c