]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:41:06 +0000 (09:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:41:06 +0000 (09:41 -0500)
1  2 
src/or/channeltls.c
src/or/command.c

Simple merge
Simple merge