commit b98cc79477e5eb70284bb70dc80d778d5d082cc1 Merge: c3e8b7f 0c11d8b Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 15 11:10:37 2015 -0400

Merge remote-tracking branch 'sebastian/bug14784'

changes/bug14784 | 4 ++++ src/or/control.c | 43 +++++++++++++++++++++++++++++++++++++++ src/or/router.c | 59 ++++++++++++++++++++++++++++++++++++++++-------------- src/or/router.h | 1 + 4 files changed, 92 insertions(+), 15 deletions(-)