[tor-commits] [tor/master] Merge remote-tracking branch 'public/my-family-list-fix-4498'

[nickm at torproject.org]

commit d76cffda601eed40d6a81eadb1240d98ee1e70a2
Merge: 8266d19 9fc1346
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 10 11:12:24 2017 -0400

    Merge remote-tracking branch 'public/my-family-list-fix-4498'

 changes/ticket4998     |   5 +++
 doc/tor.1.txt          |  13 ++++---
 src/or/config.c        | 102 ++++++++++++++++++++++++++++++-------------------
 src/or/or.h            |   3 +-
 src/or/router.c        |  12 ++----
 src/test/test_config.c |  49 ++++++++++++++++--------
 6 files changed, 114 insertions(+), 70 deletions(-)

diff --cc src/or/config.c
index e1c1cbf,05c6040..09d558e
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -398,14 -395,14 +398,14 @@@ static config_var_t option_vars_[] = 
    V(MaxOnionQueueDelay,          MSEC_INTERVAL, "1750 msec"),
    V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"),
    V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"),
-   V(MyFamily,                    STRING,   NULL),
+   VAR("MyFamily",                LINELIST, MyFamily_lines,       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"),
 -  V(WarnUnsafeSocks,              BOOL,     "1"),
 +  OBSOLETE("PredictedPortsRelevanceTime"),
 +  OBSOLETE("WarnUnsafeSocks"),
    VAR("NodeFamily",              LINELIST, NodeFamilies,         NULL),
    V(NumCPUs,                     UINT,     "0"),
    V(NumDirectoryGuards,          UINT,     "0"),