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

[nickm at torproject.org]

commit d818f1e86d1940689b19bb0abc66325aaa1436f2
Merge: 94f478c84 132e2f69b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:53:25 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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