commit bea47fde59e7748557c9d55473988141fa6420c1 Merge: 78b827467 74e8fd22c Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23690 | 5 +++++ src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+)