]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2013 14:47:26 +0000 (10:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2013 14:47:26 +0000 (10:47 -0400)
commit759de9f756cac3fb4034bfbbb7fd5195c0b24a34
tree069809d5659c5afb4e5164dff01aae08c63eb6a5
parent31f6806aa7d529ec42f9ddfacdc64bdd644863a7
parent938ee9b24dfda03a68a71d43b88e9fb00a90f9c8
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/channel.c
src/or/connection_or.c