[tor-commits] [tor/master] Merge branch 'bug23690_028'

[nickm at torproject.org]

commit 8ccefa7b7afac9626a9e448c0cc4694f5fa51097
Merge: 4e6374c26 f7222e6d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 29 10:28:33 2017 -0400

    Merge branch 'bug23690_028'

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