]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Feb 2014 15:38:24 +0000 (10:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Feb 2014 15:38:24 +0000 (10:38 -0500)
commit372adfa09a143490dfc058a6e2db78ca27ef9399
treea01dd55e84961d85b1067a6d1c22cd1764ccb0b6
parent5990edd1952361faca4619728b50587061d81be7
parenta7e946596d6da9aca80456141b7fddbc198c217c
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/channeltls.c
src/or/connection.c
src/or/connection_or.c