commit 69918629f56ee61ff6c538ea53caefefbabf84f6 Merge: 532873a92 4a604d993 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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