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