[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 136fb78f405d78a2443f97191fa253083d7d7ac7
Merge: bc4a44e42 1d48712c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:21:19 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug18100         | 5 +++++
 src/or/connection_edge.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)