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

[nickm at torproject.org]

commit 4d0a8f53ed617ff1f936234e7fb222074d63813d
Merge: 170b58b73 f6ecda840
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:21:19 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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