commit 440228907da9aff06562c4193ab9551b9fc5bad8 Merge: 55a2bfb 74d710e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 6 10:12:42 2016 -0400

Merge remote-tracking branch 'sebastian/bug20065'

changes/bug20065 | 5 +++++ src/or/router.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)