[tor-commits] [tor/master] Merge branch 'feature12538_028_01_squashed'
nickm at torproject.org
nickm at torproject.org
Mon Dec 21 12:30:55 UTC 2015
commit c4fb7ad0348a190be8496b429aa96982f1b26917
Merge: 14c9b99 ea6f884
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Dec 18 13:16:49 2015 -0500
Merge branch 'feature12538_028_01_squashed'
changes/feature12538 | 6 +
doc/tor.1.txt | 6 +
src/or/config.c | 64 ++++++-
src/or/config.h | 2 +
src/or/directory.c | 12 +-
src/or/directory.h | 3 +-
src/or/dirserv.c | 21 ++-
src/or/dirvote.c | 3 +-
src/or/dirvote.h | 1 +
src/or/networkstatus.c | 32 ++++
src/or/networkstatus.h | 4 +
src/or/nodelist.c | 17 +-
src/or/or.h | 12 ++
src/or/router.c | 118 ++++++++----
src/or/router.h | 1 +
src/or/routerlist.c | 16 +-
src/or/routerlist.h | 3 +
src/or/routerparse.c | 15 +-
src/test/include.am | 1 +
src/test/test_dir.c | 321 +++++----------------------------
src/test/test_dir_common.c | 423 ++++++++++++++++++++++++++++++++++++++++++++
src/test/test_dir_common.h | 52 ++++++
src/test/test_nodelist.c | 41 +++++
src/test/test_options.c | 115 +++++++++++-
src/test/test_routerlist.c | 280 ++++++++++++++++++++++++++++-
25 files changed, 1226 insertions(+), 343 deletions(-)
More information about the tor-commits
mailing list