]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 22:51:37 +0000 (18:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 22:51:37 +0000 (18:51 -0400)
commit5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2
tree1a5096affb2660985bee8e5486018fdee35c08c2
parentf5c59eb28a82b5dbdf9e08955cd6129e8b824c4e
parent9740f067c4bed47beb63483be4f4636167a04019
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/control.c
src/or/connection.c
src/or/control.c
src/or/or.h