commit 9acca040257caf5894126e8da3df7226f6dcd480 Merge: 5955b63 0c46dc8 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:17:32 2017 -0400

Merge branch 'maint-0.3.0'

changes/trove-2017-004 | 8 ++++++++ src/or/connection_edge.c | 21 ++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-)