[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug14784'
nickm at torproject.org
nickm at torproject.org
Wed Apr 15 15:11:05 UTC 2015
commit b98cc79477e5eb70284bb70dc80d778d5d082cc1
Merge: c3e8b7f 0c11d8b
Author: Nick Mathewson <nickm at 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(-)
More information about the tor-commits
mailing list