]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2'
authorRoger Dingledine <arma@torproject.org>
Mon, 21 Nov 2011 23:36:49 +0000 (18:36 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 21 Nov 2011 23:36:49 +0000 (18:36 -0500)
commit6a76007b089a2ca31b67b2ce15dd28edeb416428
treed61bc05bc50b9f4ac8782f321ae6af960c8fa9db
parentc9f24edb13faf17dc314be51127736acfc3de17a
parent97a209ea28f1b64fba51157e3e695c676eb0cf8e
Merge branch 'maint-0.2.2'

Conflicts:
src/or/dirserv.c
doc/tor.1.txt
src/or/config.c
src/or/cpuworker.c
src/or/dirserv.c
src/or/or.h