[tor-commits] [tor/maint-0.3.4] Merge branch 'bug26269_029' into maint-0.2.9

[nickm at torproject.org]

commit 8b53dfc3626f293f821b8e8afe88cca62224f20b
Merge: 9faa28b60 015fcd0e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:14:39 2018 -0400

    Merge branch 'bug26269_029' into maint-0.2.9

 changes/bug26269 |  5 +++++
 src/or/router.c  | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)