commit fd8ef8dc573e0d20141fbd352a24a8c7fd0e305b Merge: 43d2f99 e3578d5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 11 16:06:02 2013 -0500 Merge remote-tracking branch 'public/bug8208' changes/bug8208 | 4 ++++ src/or/router.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)