[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.3.0

[nickm at torproject.org]

commit 333d5d0f2afb4023d9763ec8ce28f973cbecc591
Merge: 528dcd1 4b5cdb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 4 20:23:38 2017 -0500

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

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