commit ab9976b7245f05a97e0285265c4cfcb225bd48e2 Merge: 657297a 5f74749 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 25 08:54:51 2017 -0400 Merge remote-tracking branch 'arma/bug22368' changes/bug22368 | 6 ++++++ src/or/router.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-)