commit 40602537493409bcf3c4eaeda7fbee6c6eb3f329 Merge: 711160a 4b5cdb2 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 28 13:57:54 2017 -0400

Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9

changes/bug21576 | 4 ++++ src/or/connection_edge.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)