]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:52:20 +0000 (17:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:52:20 +0000 (17:52 -0400)
commitaf7fab020accd31f95ba2037ccd25c65e3290571
treeece006ac592b5d153e173332d6489acc22f98058
parent5c83c06c985d314f31c72d3fb5a29c1c2f396f66
parent8df3a909466217d6738d6fe4f7555f569b2a4cb7
Merge remote branch 'origin/maint-0.2.2'

Conflicts:
src/or/config.c
src/or/config.c
src/or/connection_edge.c
src/or/dirserv.c
src/or/or.h