]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2011 17:36:40 +0000 (13:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2011 17:36:40 +0000 (13:36 -0400)
commitacd6a4856bccff92eb241b18066ca7df577ab5f2
tree153eb944a6f61e3591831b3fde0385ee4e51e5bd
parente36f9d1d9beec0daed57b68f936293dccc77b171
parent0b3166fffa0e5e19c63fd95538f87d634444d28c
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/connection.c
src/or/circuitbuild.c
src/or/connection.c
src/or/connection_or.c
src/or/control.c
src/or/dirvote.c
src/or/microdesc.c
src/or/or.h