commit cc7de9ce1d0532d97623a74ed014e39c62a6a840
Merge: aec505a31 30225fd89
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Sat Mar 3 11:53:01 2018 -0500
Merge branch 'ticket23814' into maint-0.3.3
changes/refactor23814 | 4 +
doc/tor.1.txt | 30 ---
src/or/bridges.c | 4 +-
src/or/config.c | 70 +------
src/or/control.c | 39 +---
src/or/directory.c | 122 ++++--------
src/or/directory.h | 25 +--
src/or/microdesc.c | 3 +-
src/or/networkstatus.c | 27 +--
src/or/or.h | 40 ----
src/or/routerlist.c | 19 +-
src/or/routerparse.c | 1 -
src/test/test_controller.c | 26 ++-
src/test/test_dir.c | 467 ++-------------------------------------------
src/test/test_options.c | 19 --
15 files changed, 109 insertions(+), 787 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits