commit 7ffef14d334e69cff649fb3aef26669bc17c62c4 Merge: 2e3645d 333d5d0 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Mar 4 20:23:57 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21576 | 4 ++++ src/or/connection_edge.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)