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

[nickm at torproject.org]

commit 4a604d99382e4aad3df257e265c852f306f7bc7f
Merge: d3894dc34 8b53dfc36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:14:43 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

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