[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 368dc1003eeb58ad11e1eb13904ef7f79ef019d1
Merge: 4ef70ff38 3a364309a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 08:35:56 2017 -0500

    Merge branch 'maint-0.3.2'

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