commit 427c8c8f63cf5752ffd0a5572e22657b6443f97f Merge: cf04886c1 2b99350ca Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 16 08:47:41 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug24898-029 | 6 ++++++ src/or/channeltls.c | 4 ++++ src/or/command.c | 4 ---- src/or/connection_or.c | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-)