January 2018 - tor-commits - lists.torproject.org

[tor/master] Use same macros to simplify options_transition_affects_*
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 93e7b837c83f8188abb701749c04063998affa61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 15 15:33:29 2017 -0500 Use same macros to simplify options_transition_affects_* --- src/or/config.c | 129 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 0eaeffaac..183c73eae 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1677,32 +1677,46 @@ get_effective_bwburst(const or_options_t *options) return (uint32_t)bw; } +/* Used in the various options_transition_affects* functions. */ +#define YES_IF_CHANGED_BOOL(opt) \ + if (!CFG_EQ_BOOL(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_INT(opt) \ + if (!CFG_EQ_INT(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_STRING(opt) \ + if (!CFG_EQ_STRING(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_LINELIST(opt) \ + if (!CFG_EQ_LINELIST(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_SMARTLIST(opt) \ + if (!CFG_EQ_SMARTLIST(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_ROUTERSET(opt) \ + if (!CFG_EQ_ROUTERSET(old_options, new_options, opt)) return 1; + /** * Return true if changing the configuration from <b>old</b> to <b>new</b> - * affects the guard susbsystem. + * affects the guard subsystem. */ static int -options_transition_affects_guards(const or_options_t *old, - const or_options_t *new) +options_transition_affects_guards(const or_options_t *old_options, + const or_options_t *new_options) { /* NOTE: Make sure this function stays in sync with * node_passes_guard_filter */ + tor_assert(old_options); + tor_assert(new_options); + + YES_IF_CHANGED_BOOL(UseEntryGuards); + YES_IF_CHANGED_BOOL(UseBridges); + YES_IF_CHANGED_BOOL(ClientUseIPv4); + YES_IF_CHANGED_BOOL(ClientUseIPv6); + YES_IF_CHANGED_BOOL(FascistFirewall); + YES_IF_CHANGED_ROUTERSET(ExcludeNodes); + YES_IF_CHANGED_ROUTERSET(EntryNodes); + YES_IF_CHANGED_SMARTLIST(FirewallPorts); + YES_IF_CHANGED_LINELIST(Bridges); + YES_IF_CHANGED_LINELIST(ReachableORAddresses); + YES_IF_CHANGED_LINELIST(ReachableDirAddresses); - tor_assert(old); - tor_assert(new); - - return - (old->UseEntryGuards != new->UseEntryGuards || - old->UseBridges != new->UseBridges || - old->ClientUseIPv4 != new->ClientUseIPv4 || - old->ClientUseIPv6 != new->ClientUseIPv6 || - old->FascistFirewall != new->FascistFirewall || - !routerset_equal(old->ExcludeNodes, new->ExcludeNodes) || - !routerset_equal(old->EntryNodes, new->EntryNodes) || - !smartlist_strings_eq(old->FirewallPorts, new->FirewallPorts) || - !config_lines_eq(old->Bridges, new->Bridges) || - !config_lines_eq(old->ReachableORAddresses, new->ReachableORAddresses) || - !config_lines_eq(old->ReachableDirAddresses, new->ReachableDirAddresses)); + return 0; } /** Fetch the active option list, and take actions based on it. All of the @@ -4712,21 +4726,19 @@ static int options_transition_affects_workers(const or_options_t *old_options, const or_options_t *new_options) { - if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || - old_options->NumCPUs != new_options->NumCPUs || - !config_lines_eq(old_options->ORPort_lines, new_options->ORPort_lines) || - old_options->ServerDNSSearchDomains != - new_options->ServerDNSSearchDomains || - old_options->SafeLogging_ != new_options->SafeLogging_ || - old_options->ClientOnly != new_options->ClientOnly || - server_mode(old_options) != server_mode(new_options) || - public_server_mode(old_options) != public_server_mode(new_options) || - !config_lines_eq(old_options->Logs, new_options->Logs) || - old_options->LogMessageDomains != new_options->LogMessageDomains) + YES_IF_CHANGED_STRING(DataDirectory); + YES_IF_CHANGED_INT(NumCPUs); + YES_IF_CHANGED_LINELIST(ORPort_lines); + YES_IF_CHANGED_BOOL(ServerDNSSearchDomains); + YES_IF_CHANGED_BOOL(SafeLogging_); + YES_IF_CHANGED_BOOL(ClientOnly); + YES_IF_CHANGED_BOOL(LogMessageDomains); + YES_IF_CHANGED_LINELIST(Logs); + + if (server_mode(old_options) != server_mode(new_options) || + public_server_mode(old_options) != public_server_mode(new_options)) return 1; - /* Check whether log options match. */ - /* Nothing that changed matters. */ return 0; } @@ -4739,37 +4751,34 @@ options_transition_affects_descriptor(const or_options_t *old_options, { /* XXX We can be smarter here. If your DirPort isn't being * published and you just turned it off, no need to republish. Etc. */ - if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || - !opt_streq(old_options->Nickname,new_options->Nickname) || - !opt_streq(old_options->Address,new_options->Address) || - !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) || - old_options->ExitRelay != new_options->ExitRelay || - old_options->ExitPolicyRejectPrivate != - new_options->ExitPolicyRejectPrivate || - old_options->ExitPolicyRejectLocalInterfaces != - new_options->ExitPolicyRejectLocalInterfaces || - old_options->IPv6Exit != new_options->IPv6Exit || - !config_lines_eq(old_options->ORPort_lines, - new_options->ORPort_lines) || - !config_lines_eq(old_options->DirPort_lines, - new_options->DirPort_lines) || - old_options->ClientOnly != new_options->ClientOnly || - old_options->DisableNetwork != new_options->DisableNetwork || - old_options->PublishServerDescriptor_ != - new_options->PublishServerDescriptor_ || - get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || + + YES_IF_CHANGED_STRING(DataDirectory); + YES_IF_CHANGED_STRING(Nickname); + YES_IF_CHANGED_STRING(Address); + YES_IF_CHANGED_LINELIST(ExitPolicy); + YES_IF_CHANGED_BOOL(ExitRelay); + YES_IF_CHANGED_BOOL(ExitPolicyRejectPrivate); + YES_IF_CHANGED_BOOL(ExitPolicyRejectLocalInterfaces); + YES_IF_CHANGED_BOOL(IPv6Exit); + YES_IF_CHANGED_LINELIST(ORPort_lines); + YES_IF_CHANGED_LINELIST(DirPort_lines); + YES_IF_CHANGED_LINELIST(DirPort_lines); + YES_IF_CHANGED_BOOL(ClientOnly); + YES_IF_CHANGED_BOOL(DisableNetwork); + YES_IF_CHANGED_BOOL(PublishServerDescriptor_); + YES_IF_CHANGED_STRING(ContactInfo); + YES_IF_CHANGED_STRING(BridgeDistribution); + YES_IF_CHANGED_LINELIST(MyFamily); + YES_IF_CHANGED_STRING(AccountingStart); + YES_IF_CHANGED_INT(AccountingMax); + YES_IF_CHANGED_INT(AccountingRule); + YES_IF_CHANGED_BOOL(DirCache); + YES_IF_CHANGED_BOOL(AssumeReachable); + + if (get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || get_effective_bwburst(old_options) != get_effective_bwburst(new_options) || - !opt_streq(old_options->ContactInfo, new_options->ContactInfo) || - !opt_streq(old_options->BridgeDistribution, - new_options->BridgeDistribution) || - !config_lines_eq(old_options->MyFamily, new_options->MyFamily) || - !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || - old_options->AccountingMax != new_options->AccountingMax || - old_options->AccountingRule != new_options->AccountingRule || - public_server_mode(old_options) != public_server_mode(new_options) || - old_options->DirCache != new_options->DirCache || - old_options->AssumeReachable != new_options->AssumeReachable) + public_server_mode(old_options) != public_server_mode(new_options)) return 1; return 0;

1 0

[tor/master] Simplify the very repetitious options_transition_allowed()
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 376f97aaa1e3a5aed60a67cee3d71ea7ccc90623 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 15 15:19:28 2017 -0500 Simplify the very repetitious options_transition_allowed() --- src/or/config.c | 190 +++++++++++++++-------------------------------------- src/or/confparse.h | 8 +++ 2 files changed, 60 insertions(+), 138 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 016d87f81..0eaeffaac 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4635,153 +4635,60 @@ options_transition_allowed(const or_options_t *old, if (!old) return 0; - if (!opt_streq(old->PidFile, new_val->PidFile)) { - *msg = tor_strdup("PidFile is not allowed to change."); - return -1; - } - - if (old->RunAsDaemon != new_val->RunAsDaemon) { - *msg = tor_strdup("While Tor is running, changing RunAsDaemon " - "is not allowed."); - return -1; - } - - if (old->Sandbox != new_val->Sandbox) { - *msg = tor_strdup("While Tor is running, changing Sandbox " - "is not allowed."); - return -1; - } - - if (strcmp(old->DataDirectory,new_val->DataDirectory)!=0) { - tor_asprintf(msg, - "While Tor is running, changing DataDirectory " - "(\"%s\"->\"%s\") is not allowed.", - old->DataDirectory, new_val->DataDirectory); - return -1; - } - - if (!opt_streq(old->KeyDirectory, new_val->KeyDirectory)) { - tor_asprintf(msg, - "While Tor is running, changing KeyDirectory " - "(\"%s\"->\"%s\") is not allowed.", - old->KeyDirectory, new_val->KeyDirectory); - return -1; - } - - if (!opt_streq(old->CacheDirectory, new_val->CacheDirectory)) { - tor_asprintf(msg, - "While Tor is running, changing CacheDirectory " - "(\"%s\"->\"%s\") is not allowed.", - old->CacheDirectory, new_val->CacheDirectory); - return -1; - } - - if (!opt_streq(old->User, new_val->User)) { - *msg = tor_strdup("While Tor is running, changing User is not allowed."); - return -1; - } - - if (old->KeepBindCapabilities != new_val->KeepBindCapabilities) { - *msg = tor_strdup("While Tor is running, changing KeepBindCapabilities is " - "not allowed."); - return -1; - } - - if (!opt_streq(old->SyslogIdentityTag, new_val->SyslogIdentityTag)) { - *msg = tor_strdup("While Tor is running, changing " - "SyslogIdentityTag is not allowed."); - return -1; - } - - if (!opt_streq(old->AndroidIdentityTag, new_val->AndroidIdentityTag)) { - *msg = tor_strdup("While Tor is running, changing " - "AndroidIdentityTag is not allowed."); - return -1; - } - - if ((old->HardwareAccel != new_val->HardwareAccel) - || !opt_streq(old->AccelName, new_val->AccelName) - || !opt_streq(old->AccelDir, new_val->AccelDir)) { - *msg = tor_strdup("While Tor is running, changing OpenSSL hardware " - "acceleration engine is not allowed."); - return -1; - } - - if (old->TestingTorNetwork != new_val->TestingTorNetwork) { - *msg = tor_strdup("While Tor is running, changing TestingTorNetwork " - "is not allowed."); - return -1; - } - - if (old->DisableAllSwap != new_val->DisableAllSwap) { - *msg = tor_strdup("While Tor is running, changing DisableAllSwap " - "is not allowed."); - return -1; - } - - if (old->TokenBucketRefillInterval != new_val->TokenBucketRefillInterval) { - *msg = tor_strdup("While Tor is running, changing TokenBucketRefill" - "Interval is not allowed"); - return -1; - } - - if (old->HiddenServiceSingleHopMode != new_val->HiddenServiceSingleHopMode) { - *msg = tor_strdup("While Tor is running, changing " - "HiddenServiceSingleHopMode is not allowed."); - return -1; - } - - if (old->HiddenServiceNonAnonymousMode != - new_val->HiddenServiceNonAnonymousMode) { - *msg = tor_strdup("While Tor is running, changing " - "HiddenServiceNonAnonymousMode is not allowed."); - return -1; - } - - if (old->DisableDebuggerAttachment && - !new_val->DisableDebuggerAttachment) { - *msg = tor_strdup("While Tor is running, disabling " - "DisableDebuggerAttachment is not allowed."); - return -1; - } - - if (old->NoExec && !new_val->NoExec) { - *msg = tor_strdup("While Tor is running, disabling " - "NoExec is not allowed."); - return -1; - } - - if (old->OwningControllerFD != new_val->OwningControllerFD) { - *msg = tor_strdup("While Tor is running, changing OwningControllerFD " - "is not allowed."); - return -1; - } +#define BAD_CHANGE_TO(opt, how) do { \ + *msg = tor_strdup("While Tor is running"how", changing " #opt \ + " is not allowed"); \ + return -1; \ + } while (0) + +#define NO_CHANGE_BOOL(opt) \ + if (! CFG_EQ_BOOL(old, new_val, opt)) BAD_CHANGE_TO(opt,"") +#define NO_CHANGE_INT(opt) \ + if (! CFG_EQ_INT(old, new_val, opt)) BAD_CHANGE_TO(opt,"") +#define NO_CHANGE_STRING(opt) \ + if (! CFG_EQ_STRING(old, new_val, opt)) BAD_CHANGE_TO(opt,"") + + NO_CHANGE_STRING(PidFile); + NO_CHANGE_BOOL(RunAsDaemon); + NO_CHANGE_BOOL(Sandbox); + NO_CHANGE_STRING(DataDirectory); + NO_CHANGE_STRING(KeyDirectory); + NO_CHANGE_STRING(CacheDirectory); + NO_CHANGE_STRING(User); + NO_CHANGE_BOOL(KeepBindCapabilities); + NO_CHANGE_STRING(SyslogIdentityTag); + NO_CHANGE_STRING(AndroidIdentityTag); + NO_CHANGE_BOOL(HardwareAccel); + NO_CHANGE_STRING(AccelName); + NO_CHANGE_STRING(AccelDir); + NO_CHANGE_BOOL(TestingTorNetwork); + NO_CHANGE_BOOL(DisableAllSwap); + NO_CHANGE_INT(TokenBucketRefillInterval); + NO_CHANGE_BOOL(HiddenServiceSingleHopMode); + NO_CHANGE_BOOL(HiddenServiceNonAnonymousMode); + NO_CHANGE_BOOL(DisableDebuggerAttachment); + NO_CHANGE_BOOL(NoExec); + NO_CHANGE_INT(OwningControllerFD); if (sandbox_is_active()) { -#define SB_NOCHANGE_STR(opt) \ - do { \ - if (! opt_streq(old->opt, new_val->opt)) { \ - *msg = tor_strdup("Can't change " #opt " while Sandbox is active"); \ - return -1; \ - } \ - } while (0) +#define SB_NOCHANGE_STR(opt) \ + if (! CFG_EQ_STRING(old, new_val, opt)) \ + BAD_CHANGE_TO(opt," with Sandbox active") +#define SB_NOCHANGE_LINELIST(opt) \ + if (! CFG_EQ_LINELIST(old, new_val, opt)) \ + BAD_CHANGE_TO(opt," with Sandbox active") +#define SB_NOCHANGE_INT(opt) \ + if (! CFG_EQ_INT(old, new_val, opt)) \ + BAD_CHANGE_TO(opt," with Sandbox active") SB_NOCHANGE_STR(Address); SB_NOCHANGE_STR(ServerDNSResolvConfFile); SB_NOCHANGE_STR(DirPortFrontPage); SB_NOCHANGE_STR(CookieAuthFile); SB_NOCHANGE_STR(ExtORPortCookieAuthFile); + SB_NOCHANGE_LINELIST(Logs); + SB_NOCHANGE_INT(ConnLimit); -#undef SB_NOCHANGE_STR - - if (! config_lines_eq(old->Logs, new_val->Logs)) { - *msg = tor_strdup("Can't change Logs while Sandbox is active"); - return -1; - } - if (old->ConnLimit != new_val->ConnLimit) { - *msg = tor_strdup("Can't change ConnLimit while Sandbox is active"); - return -1; - } if (server_mode(old) != server_mode(new_val)) { *msg = tor_strdup("Can't start/stop being a server while " "Sandbox is active"); @@ -4789,6 +4696,13 @@ options_transition_allowed(const or_options_t *old, } } +#undef SB_NOCHANGE_LINELIST +#undef SB_NOCHANGE_STR +#undef SB_NOCHANGE_INT +#undef BAD_CHANGE_TO +#undef NO_CHANGE_BOOL +#undef NO_CHANGE_INT +#undef NO_CHANGE_STRING return 0; } diff --git a/src/or/confparse.h b/src/or/confparse.h index fc4a7b2d0..f1f203034 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -208,5 +208,13 @@ const char *config_expand_abbrev(const config_format_t *fmt, int command_line, int warn_obsolete); void warn_deprecated_option(const char *what, const char *why); +/* Helper macros to compare an option across two configuration objects */ +#define CFG_EQ_BOOL(a,b,opt) ((a)->opt == (b)->opt) +#define CFG_EQ_INT(a,b,opt) ((a)->opt == (b)->opt) +#define CFG_EQ_STRING(a,b,opt) (!strcmp_opt((a)->opt, (b)->opt)) +#define CFG_EQ_SMARTLIST(a,b,opt) smartlist_strings_eq((a)->opt, (b)->opt) +#define CFG_EQ_LINELIST(a,b,opt) config_lines_eq((a)->opt, (b)->opt) +#define CFG_EQ_ROUTERSET(a,b,opt) routerset_equal((a)->opt, (b)->opt) + #endif /* !defined(TOR_CONFPARSE_H) */

1 0

[tor/master] Merge branch 'simplify_transition_allowed'
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 751595551afb6282d952c482a11db35daf3736ab Merge: c349bfec3 93e7b837c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:39:37 2018 -0500 Merge branch 'simplify_transition_allowed' src/or/config.c | 319 ++++++++++++++++++++--------------------------------- src/or/confparse.h | 8 ++ 2 files changed, 129 insertions(+), 198 deletions(-)

1 0

[tor/master] Merge branch 'bug24526_squashed'
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit c349bfec36ccb31a202e1ad0421b3fb1a3e4ee16 Merge: e8bd80641 ac0f819ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:33:52 2018 -0500 Merge branch 'bug24526_squashed' changes/bug24526 | 4 ++++ doc/tor.1.txt | 13 +++++++++++-- src/config/torrc.minimal.in-staging | 6 ++++++ src/config/torrc.sample.in | 6 ++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --cc src/config/torrc.minimal.in-staging index 4fede6dcf,299f1685d..90f91e5cb --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@@ -161,12 -164,11 +164,15 @@@ ## See https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. + ## + ## If you are running multiple relays, you MUST set this option. + ## #MyFamily $keyid,$keyid,... +## Uncomment this if you want your relay to allow IPv6 exit traffic. +## (Relays only allow IPv4 exit traffic by default.) +#IPv6Exit 1 + ## A comma-separated list of exit policies. They're considered first ## to last, and the first match wins. ## diff --cc src/config/torrc.sample.in index 865e9f660,8923d4602..4e183478e --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@@ -162,16 -164,11 +165,19 @@@ ## https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. + ## + ## If you are running multiple relays, you MUST set this option. + ## #MyFamily $keyid,$keyid,... +## Uncomment this if you do *not* want your relay to allow any exit traffic. +## (Relays allow exit traffic by default.) +#ExitRelay 0 + +## Uncomment this if you want your relay to allow IPv6 exit traffic. +## (Relays only allow IPv4 exit traffic by default.) +#IPv6Exit 1 + ## A comma-separated list of exit policies. They're considered first ## to last, and the first match wins. ##

1 0

[tor/master] Note contactinfo and myfamily as required in more places
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit ac0f819ce5d584c10ce83b35e10fb1a85643782f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 11:10:14 2017 -0500 Note contactinfo and myfamily as required in more places Includes a sentence from cypherpunks; for ticket 24526. --- changes/bug24526 | 4 ++++ doc/tor.1.txt | 13 +++++++++++-- src/config/torrc.minimal.in-staging | 6 ++++++ src/config/torrc.sample.in | 6 ++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/changes/bug24526 b/changes/bug24526 new file mode 100644 index 000000000..4d69defa9 --- /dev/null +++ b/changes/bug24526 @@ -0,0 +1,4 @@ + o Documentation: + - Document that operators who run more than one relay or bridge are + expected to set MyFamily and ContactInfo correctly. Closes ticket + 24526. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b2218e33c..c0618ba85 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1720,7 +1720,12 @@ is non-zero): descriptors containing these lines and that Google indexes them, so spammers might also collect them. You may want to obscure the fact that it's an email address and/or generate a new address for this - purpose. + purpose. + + + + ContactInfo **must** be set to a working address if you run more than one + relay or bridge. (Really, everybody running a relay or bridge should set + it.) + [[ExitRelay]] **ExitRelay** **0**|**1**|**auto**:: Tells Tor whether to run as an exit relay. If Tor is running as a @@ -1948,7 +1953,11 @@ is non-zero): compromise its concealment. + + When listing a node, it's better to list it by fingerprint than by - nickname: fingerprints are more reliable. + nickname: fingerprints are more reliable. + + + + MyFamily **must** be set correctly if you run more than one relay or + bridge. (That is, every relay should list all the others as described + above.) [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19 diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index c537c51f9..299f1685d 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -132,6 +132,9 @@ ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. ## Notice that "<" and ">" are recommended. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one. ## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy @@ -161,6 +164,9 @@ ## See https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 8f3597f3f..8923d4602 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -135,6 +135,9 @@ ## descriptors containing these lines and that Google indexes them, so ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> @@ -161,6 +164,9 @@ ## https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... ## A comma-separated list of exit policies. They're considered first

1 0

[tor/master] Merge branch 'bug24584'
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit d0adf5ae952d303dcd1d6ff06e523580c8055ece Merge: 7a6060041 f205dabf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:28:29 2018 -0500 Merge branch 'bug24584' changes/bug24584 | 5 +++++ src/or/main.c | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-)

1 0

[tor/master] Stop using event_base_once().
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit f205dabf7ae5c8dde9adc3cc39ef7721953abfea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 12:21:00 2017 -0500 Stop using event_base_once(). This function leaks memory when the event_base is freed before the event itself fires. That's not harmful, but it's annoying when trying to debug other memory leaks. Fixes bug 24584; bugfix on 0.2.8.1-alpha. --- changes/bug24584 | 5 +++++ src/or/main.c | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/changes/bug24584 b/changes/bug24584 new file mode 100644 index 000000000..071c7c2a1 --- /dev/null +++ b/changes/bug24584 @@ -0,0 +1,5 @@ + o Minor bugfixes (memory cleanup): + - Avoid possible at-exit memory leaks related to use of Libevent's + event_base_once() function. (This function tends to leak memory + if the event_base is closed before the event fires.) Fixes bug 24584; + bugfix on 0.2.8.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index aae98dd8a..6d58cf341 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -666,6 +666,9 @@ tell_event_loop_to_run_external_code(void) } } +/** Event to run 'shutdown did not work callback'. */ +static struct event *shutdown_did_not_work_event = NULL; + /** Failsafe measure that should never actually be necessary: If * tor_shutdown_event_loop_and_exit() somehow doesn't successfully exit the * event loop, then this callback will kill Tor with an assertion failure @@ -699,9 +702,10 @@ tor_shutdown_event_loop_and_exit(int exitcode) * exit normally. */ /* XXXX We should consider this code if it's never used. */ struct timeval ten_seconds = { 10, 0 }; - event_base_once(tor_libevent_get_base(), -1, EV_TIMEOUT, - shutdown_did_not_work_callback, NULL, - &ten_seconds); + shutdown_did_not_work_event = tor_evtimer_new( + tor_libevent_get_base(), + shutdown_did_not_work_callback, NULL); + event_add(shutdown_did_not_work_event, &ten_seconds); /* Unlike loopexit, loopbreak prevents other callbacks from running. */ tor_event_base_loopbreak(tor_libevent_get_base()); @@ -1341,6 +1345,8 @@ find_periodic_event(const char *name) return NULL; } +/** Event to run initialize_periodic_events_cb */ +static struct event *initialize_periodic_events_event = NULL; /** Helper, run one second after setup: * Initializes all members of periodic_events and starts them running. * @@ -1352,6 +1358,7 @@ initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) (void) fd; (void) events; (void) data; + tor_event_free(initialize_periodic_events_event); int i; for (i = 0; periodic_events[i].name; ++i) { periodic_event_launch(&periodic_events[i]); @@ -1380,9 +1387,10 @@ initialize_periodic_events(void) NAMED_CALLBACK(check_dns_honesty); struct timeval one_second = { 1, 0 }; - event_base_once(tor_libevent_get_base(), -1, EV_TIMEOUT, - initialize_periodic_events_cb, NULL, - &one_second); + initialize_periodic_events_event = tor_evtimer_new( + tor_libevent_get_base(), + initialize_periodic_events_cb, NULL); + event_add(initialize_periodic_events_event, &one_second); } STATIC void @@ -3384,6 +3392,8 @@ tor_free_all(int postfork) periodic_timer_free(second_timer); teardown_periodic_events(); periodic_timer_free(refill_timer); + tor_event_free(shutdown_did_not_work_event); + tor_event_free(initialize_periodic_events_event); if (!postfork) { release_lockfile();

1 0

[tor/master] Add a blank line per dgoulet review.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit e8bd806412dc92054ebf7bffe6c604fef511fdbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:29:29 2018 -0500 Add a blank line per dgoulet review. --- src/or/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/main.c b/src/or/main.c index 8d793e0a5..fe31f0ed0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1404,6 +1404,7 @@ find_periodic_event(const char *name) /** Event to run initialize_periodic_events_cb */ static struct event *initialize_periodic_events_event = NULL; + /** Helper, run one second after setup: * Initializes all members of periodic_events and starts them running. *

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit 64e824d5e1764d8e447d99ee2cb542a1d3e80cb5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 14:20:20 2018 +0000 Update translations for tails-greeter-2_completed --- fr/fr.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 003453b14..5d99714e6 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -102,8 +102,8 @@ msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " -"être connecté à un réseau" +"Vous configurerez le pont Tor (bridge) et le mandataire local plus tard, " +"après vous être connecté à un réseau." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" @@ -201,8 +201,9 @@ msgid "" " disable all networking." msgstr "" "Si votre connexion Internet est censurée, filtrée ou relayée par un serveur " -"mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour " -"travailler complètement hors ligne, vous pouvez désactiver le réseau." +"mandataire, vous pouvez configurer un pont Tor (bridge) ou un mandataire " +"local. Pour travailler complètement hors ligne, vous pouvez désactiver le " +"réseau." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" @@ -210,7 +211,7 @@ msgstr "Se connecter directement au réseau Tor (par défaut)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "Configurer un pont Tor ou un mandataire local" +msgstr "Configurer un pont Tor (bridge) ou un mandataire local" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -254,7 +255,7 @@ msgstr "Camouflage _Windows" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Pont et mandataire" +msgstr "Pont (bridge) et mandataire" #: ../tailsgreeter/gui.py:397 msgid "Offline"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit 0afc8949c7307ce957ffd69a307b849733349b71 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 14:20:14 2018 +0000 Update translations for tails-greeter-2 --- fr/fr.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/fr.po b/fr/fr.po index 003453b14..5d99714e6 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -102,8 +102,8 @@ msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Vous configurerez le pont Tor et le mandataire local plus tard, après vous " -"être connecté à un réseau" +"Vous configurerez le pont Tor (bridge) et le mandataire local plus tard, " +"après vous être connecté à un réseau." #: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" @@ -201,8 +201,9 @@ msgid "" " disable all networking." msgstr "" "Si votre connexion Internet est censurée, filtrée ou relayée par un serveur " -"mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour " -"travailler complètement hors ligne, vous pouvez désactiver le réseau." +"mandataire, vous pouvez configurer un pont Tor (bridge) ou un mandataire " +"local. Pour travailler complètement hors ligne, vous pouvez désactiver le " +"réseau." #: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" @@ -210,7 +211,7 @@ msgstr "Se connecter directement au réseau Tor (par défaut)" #: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge or local proxy" -msgstr "Configurer un pont Tor ou un mandataire local" +msgstr "Configurer un pont Tor (bridge) ou un mandataire local" #: ../data/greeter.ui.h:43 msgid "Disable all networking" @@ -254,7 +255,7 @@ msgstr "Camouflage _Windows" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Pont et mandataire" +msgstr "Pont (bridge) et mandataire" #: ../tailsgreeter/gui.py:397 msgid "Offline"

1 0