[tor-commits] [tor/master] Merge branch 'maint-0.2.9'
nickm at torproject.org
nickm at torproject.org
Mon Nov 21 17:44:30 UTC 2016
commit c35d481f56284ebeafc2860eed27c9833d631983
Merge: 6dc25e7 e2c8814
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Nov 21 12:44:21 2016 -0500
Merge branch 'maint-0.2.9'
changes/bug20423 | 6 ++++++
src/or/control.c | 2 +-
src/or/dirserv.c | 3 ++-
src/or/router.c | 39 +++++++++++++++++++++++++--------------
src/or/router.h | 3 ++-
src/or/transports.c | 2 +-
src/test/test_config.c | 4 +++-
7 files changed, 40 insertions(+), 19 deletions(-)
More information about the tor-commits
mailing list