]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Feb 2014 02:41:59 +0000 (21:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Feb 2014 02:41:59 +0000 (21:41 -0500)
commita73b0da653db051275311ea791098a8a9dacc98f
treefd7c42c27ffd5f81d59f7275551ef502584dee82
parenta0577aacb4a94e803b4d9ec266e969f1aa5a88f3
parent7f6aa780e3183f34b2fa771e17813018e6b28115
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/channeltls.c