[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12538_merged'
commit 62f97545e48758c39a5e6e7c4e7cd01073affae0
Merge: 079644b f0a4282
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Dec 21 07:30:32 2015 -0500
Merge remote-tracking branch 'public/bug12538_merged'
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_config.c | 5 +
src/test/test_dir.c | 321 +++++----------------------------
src/test/test_dir_common.c | 424 ++++++++++++++++++++++++++++++++++++++++++++
src/test/test_dir_common.h | 52 ++++++
src/test/test_nodelist.c | 41 +++++
src/test/test_options.c | 115 +++++++++++-
src/test/test_routerlist.c | 282 ++++++++++++++++++++++++++++-
26 files changed, 1234 insertions(+), 343 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits