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

[nickm at torproject.org]

commit 74e8fd22c9971a7184d74d2775ca1c575e54e08f
Merge: 35574d4a9 132e2f69b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:53:25 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23690     | 5 +++++
 src/or/circuitlist.c | 1 +
 2 files changed, 6 insertions(+)