]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2'
authorRoger Dingledine <arma@torproject.org>
Mon, 27 Sep 2010 22:33:12 +0000 (18:33 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 27 Sep 2010 22:33:12 +0000 (18:33 -0400)
commitf006f02ca48c73d3833ae548ca41398ffdacb5c8
tree5d242d322bc719febaa55891914ae9842e28e3f4
parentaf7fab020accd31f95ba2037ccd25c65e3290571
parenta467bf5fbb0fd03ecf76864315cf1ca3c33f34e3
Merge branch 'maint-0.2.2'
src/or/connection_edge.c