]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge commit 'origin/maint-0.2.1'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 Nov 2009 20:24:52 +0000 (15:24 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 Nov 2009 20:24:52 +0000 (15:24 -0500)
commit0a58567ce3418f410cf1dd0143dd3e56b4a4bd1f
treee0f0f5839e7ad542131c60589db6efe6505fc084
parenteb1faf8a0a51592618b5595fc152d26d71e3f43e
parentce0a89e2624471272ffc4950c5069d9b81a7f0b9
Merge commit 'origin/maint-0.2.1'

Conflicts:
src/common/tortls.c
ChangeLog
src/common/tortls.c
src/or/connection_or.c