]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Oct 2009 16:33:22 +0000 (12:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Oct 2009 16:33:22 +0000 (12:33 -0400)
commit5ef97ddd42dfd51fc296bb51b612780aec09c5c7
tree25ee0fef4a99b3e5d5945592869ab8b4fedf9db3
parentd407d81a447f7ff7d53ac838703574c89acbc732
parent16dc543851bb82c481d4319d557ffea5bef6cc50
Merge commit 'origin/maint-0.2.1'

Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/or/config.c
src/win32/orconfig.h
ChangeLog
contrib/tor-mingw.nsi.in
src/or/config.c
src/win32/orconfig.h