]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 05:55:34 +0000 (01:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 05:55:34 +0000 (01:55 -0400)
commit42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4
tree2461a1a5f1660e0e4f3bc1aed52d3fc80c968f1b
parent6f200b61b7effe811809fe60459b0b5b58cb3dbb
parenta5232e0c4c572cdff85701f698b8b90c9443d7e4
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/circuitbuild.c
src/or/command.c
src/or/control.c
src/or/directory.c
src/or/dirvote.c
src/or/eventdns.c