diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-14 14:48:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-14 14:48:00 -0500 |
| commit | b169c8c14f23394b40305f38ee4ce08add278e27 (patch) | |
| tree | 0649da16a97792103773f9d5cedbfd75deac49bd /src/app/config/config.c | |
| parent | 691dec5d4615dec9a845d0f7dea7ef55cc66fe62 (diff) | |
| parent | b269ab5aaeee65a3a0b1e5e0923d9dc7898c232e (diff) | |
| download | tor-b169c8c14f23394b40305f38ee4ce08add278e27.tar.gz tor-b169c8c14f23394b40305f38ee4ce08add278e27.zip | |
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
Diffstat (limited to 'src/app/config/config.c')
| -rw-r--r-- | src/app/config/config.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 22070c346b..ecf4c21545 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -421,6 +421,10 @@ static config_var_t option_vars_[] = { V(ExcludeExitNodes, ROUTERSET, NULL), OBSOLETE("ExcludeSingleHopRelays"), V(ExitNodes, ROUTERSET, NULL), + /* Researchers need a way to tell their clients to use specific + * middles that they also control, to allow safe live-network + * experimentation with new padding machines. */ + V(MiddleNodes, ROUTERSET, NULL), V(ExitPolicy, LINELIST, NULL), V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPolicyRejectLocalInterfaces, BOOL, "0"), @@ -1693,6 +1697,7 @@ options_need_geoip_info(const or_options_t *options, const char **reason_out) int routerset_usage = routerset_needs_geoip(options->EntryNodes) || routerset_needs_geoip(options->ExitNodes) || + routerset_needs_geoip(options->MiddleNodes) || routerset_needs_geoip(options->ExcludeExitNodes) || routerset_needs_geoip(options->ExcludeNodes) || routerset_needs_geoip(options->HSLayer2Nodes) || @@ -2132,6 +2137,7 @@ options_act(const or_options_t *old_options) options->HSLayer2Nodes) || !routerset_equal(old_options->HSLayer3Nodes, options->HSLayer3Nodes) || + !routerset_equal(old_options->MiddleNodes, options->MiddleNodes) || options->StrictNodes != old_options->StrictNodes) { log_info(LD_CIRC, "Changed to using entry guards or bridges, or changed " |