commit 2a1013948d9a7415c0901c5db284afa188ddf5b2 Merge: 4273a39 00ffc47 Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 9 10:32:21 2017 -0400 Merge branch 'dgoulet_ticket22060_031_01_squashed' changes/bug22060 | 27 +++++ doc/tor.1.txt | 138 +--------------------- src/or/buffers.c | 5 +- src/or/circuitbuild.c | 29 +---- src/or/circuituse.c | 16 +-- src/or/config.c | 265 +++++++------------------------------------ src/or/config.h | 3 +- src/or/connection_edge.c | 12 +- src/or/control.c | 21 +--- src/or/or.h | 56 --------- src/or/rendservice.c | 2 - src/or/router.c | 14 +-- src/or/routerlist.c | 31 ++--- src/or/routerlist.h | 8 +- src/test/test_config.c | 289 ++++++++++++----------------------------------- src/test/test_options.c | 200 ++++---------------------------- 16 files changed, 208 insertions(+), 908 deletions(-) diff --cc src/or/config.c index 9280868,1b40561..e1c1cbf --- a/src/or/config.c +++ b/src/or/config.c @@@ -401,11 -398,11 +401,11 @@@ static config_var_t option_vars_[] = V(MyFamily, STRING, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), - V(NATDListenAddress, LINELIST, NULL), + OBSOLETE("NATDListenAddress"), VPORT(NATDPort), V(Nickname, STRING, NULL), - V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"), + OBSOLETE("PredictedPortsRelevanceTime"), - V(WarnUnsafeSocks, BOOL, "1"), + OBSOLETE("WarnUnsafeSocks"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"),