]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug14084'
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Jan 2015 19:07:37 +0000 (14:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Jan 2015 19:07:37 +0000 (14:07 -0500)
commite7e33d4b04be508e327f79786e1e0a885afd7a6d
tree7c43f361338709c0bc651660c15393bdf892c646
parent9ddc1fb10c0e40fccee6d4d8b122250f8358ca81
parent18a15747efe29d2df7a8ea852439fd30886cf9b3
Merge branch 'bug14084'
doc/tor.1.txt
src/or/config.c
src/or/connection_edge.c
src/or/rendservice.c