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

[nickm at torproject.org]

commit 2f9032f1cc6a48b0f107e4479d2c2849d7b7d177
Merge: bad224df8 6f87a8589
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:53:24 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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