]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Sun, 31 May 2009 23:17:22 +0000 (19:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 31 May 2009 23:17:22 +0000 (19:17 -0400)
commit77ffd6b2a7bb8450c033763e2eb4d7f0ed7a5757
treeb7578a5b8c4c86909b9f63546b6d557a2782823a
parente84ddead349e5af8c183042d3de27ecb4b6d4e87
parentc4c7dcd453b62b3d3bcc8e78df8455a77645e62a
Merge commit 'origin/maint-0.2.1'
ChangeLog
src/or/circuitbuild.c
src/or/config.c
src/or/control.c
src/or/or.h