]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug11553_024' into bug11553_025
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Apr 2014 17:00:45 +0000 (13:00 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Apr 2014 17:00:45 +0000 (13:00 -0400)
commitbd169aa9a512857fe95fa0cbe44e4e6dbc2c800f
tree3b864e4cd291c2bd240dd7fbbf0d7e200f40dd92
parenteb896d5e6f09902a760af010326b79ce82492da1
parent0d75344b0e0eafc89db89a974e87b16564cd8f0a
Merge remote-tracking branch 'public/bug11553_024' into bug11553_025

Conflicts:
src/or/channel.h
src/or/channel.c
src/or/channel.h
src/or/circuitbuild.c
src/or/connection.c