commit 84800f5a8fcca1c3eba26b950c424430234c5078 Merge: 5ced052a1 529faef28 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 10:15:22 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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