commit 69cb6f34cb87b0b2ba23d84cf19163cb5c9f4929 Merge: 4334a4b e16148a Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 09:10:46 2017 -0500

Merge remote-tracking branch 'dgoulet/bug19953_030_01'

changes/bug19953 | 6 ++++++ src/or/router.c | 7 ++++++- src/or/routerkeys.c | 7 +++++-- 3 files changed, 17 insertions(+), 3 deletions(-)