commit 3a1cba7d90855d63387168a0345f9c51436bd322 Merge: c04209c 333d5d0 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 4 20:24:02 2017 -0500

Merge branch 'maint-0.3.0'

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