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

[nickm at torproject.org]

commit 00aeecb397a65b3687a01fbe7b33773ccbbac158
Merge: b9826ba45 3a364309a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 08:35:56 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24167    | 7 +++++++
 src/or/connection.c | 4 ++++
 2 files changed, 11 insertions(+)