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