commit 0d67e8d383528ce98b7e6fe0da46621344d697f8 Merge: cd47dfd 4060253 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21576 | 4 ++++ src/or/connection_edge.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)