Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
commitcb92d47deca15c44dd52cad6fc326520648c632e
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:41:06 +0000 (16 09:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 14:41:06 +0000 (16 09:41 -0500)
tree4a13531c5add07457232ad2d112e0cc17d2a7da6
parent2b99350ca4c905db1bd4f1aecc630b4f55933e96
parente7f631478254c38d6d8b1bea65840b4c6429e4f4
Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
src/or/channeltls.c
src/or/command.c