commit f6ecda84005cc436c656e5fc7ed5b6dfe71a6ca8 Merge: 925ef048a 4473271c6 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:21:14 2017 -0400

Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9

changes/bug18100 | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)