commit a86f78a9f258589b5a0a4323c8e5eb1280dd4c95 Merge: fe0d346 10330c1 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 11 11:23:58 2016 -0500

Merge remote-tracking branch 'teor/bug17153'

changes/bug17153 | 4 ++++ src/or/router.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)