commit 2c884fd8cc0a7a8c42003e10b5033deb5a7d6d99 Merge: 0793ef8 36e7716 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 28 14:03:40 2014 -0400

Merge remote-tracking branch 'rl1987/feature10427'

changes/ticket10427 | 4 ++++ src/or/router.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+)