]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Nov 2011 16:42:38 +0000 (11:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Nov 2011 16:42:38 +0000 (11:42 -0500)
commit3ef40f69937abc105877189fbecd78df67dd2d8e
treee711a3cb7ecdeb9dc4808ca9a3b23cff175c5d4c
parent4af82fb3886e8be25ba83a1f93da54bf0d5d7974
parent5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/connection_or.c