commit 4e4d2ed864bee5c019156024f0047d3c45a53fcd Merge: 2f3b9151e 69918629f Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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