commit bc9bc9304a9c3312d44d2efa29453977e48083ab Merge: 1e4cc366d 4a604d993 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)