commit 8c1c71aa2c941d7defd8874f49e541b0f185f6b3 Merge: b7fac18 a873ba8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 26 12:12:54 2016 -0400 Merge branch 'maint-0.2.8' src/or/router.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)