- tor-commits - lists.torproject.org

[tor/master] Update man page for new UseBridges tristate behaviour.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111 Author: anonym <anonym(a)lavabit.com> Date: Mon May 30 23:52:02 2011 +0200 Update man page for new UseBridges tristate behaviour. --- doc/tor.1.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1815a8d..8aa32e8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,10 +708,14 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**:: - When set, Tor will fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**|**auto**:: + Make Tor fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - guards. (Default: 0) + guards. If the option is 1, bridges must be used and if no bridges are + configured Tor will not make any connections until a bridge is configured; + if it's "auto", Tor will use bridges if any are configured, otherwise it + will connect directly to the Tor network; if it's 0, bridges are not used + at all. (Defaults to auto) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/master] Add an "auto" option to UseBridges
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 507c1257a4d9c629fefc2adbad8db73607749734 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:32:38 2011 -0400 Add an "auto" option to UseBridges UseBridges 1 now means "connect only to bridges; if you know no bridges, don't make connections." UseBridges auto means "Use bridges if they are known, and we have no EntryNodes set, and we aren't a server." UseBridges 0 means "don't use bridges." --- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6635cac..44cecf3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -376,7 +376,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), @@ -3232,6 +3232,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall."); + /* XXX023 use autobool instead. */ + if (!strcmp(options->UseBridges_, "auto")) { + options->UseBridges = (options->Bridges && + !server_mode(options) && + !options->EntryNodes); + } else if (!strcmp(options->UseBridges_, "0")) { + options->UseBridges = 0; + } else if (!strcmp(options->UseBridges_, "1")) { + options->UseBridges = 1; + } else { + REJECT("UseBridges must be 0, 1, or auto"); + } + if (options->UseBridges && server_mode(options)) REJECT("Servers must be able to freely connect to the rest " @@ -3566,10 +3579,8 @@ options_validate(or_options_t *old_options, or_options_t *options, if (validate_dir_authorities(options, old_options) < 0) REJECT("Directory authority line did not parse. See logs for details."); - if (options->UseBridges && !options->Bridges) - REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) - REJECT("If you set UseBridges, you must set TunnelDirConns."); + REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..456dce2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,7 +2480,17 @@ typedef struct { * when doing so. */ char *BridgePassword; - int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ + /** Whether we should start all circuits with a bridge. "1" means strictly + * yes, "0" means strictly no, and "auto" means that we do iff any bridges + * are configured, we are not running a server and have not specified a list + * of entry nodes. */ + char *UseBridges_; + /** Effective value of UseBridges. Will be set equally for UseBridges set to + * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are + * configured, we are not running a server and have not specified a list of + * entry nodes. */ + int UseBridges; + config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0

[tor/master] Changes file for bug2355.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit b79d50dfcc77013329b2fbfd4a84af29a5965b27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:49:16 2011 -0400 Changes file for bug2355. --- changes/bug2355 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug2355 b/changes/bug2355 new file mode 100644 index 0000000..ee0ae4b --- /dev/null +++ b/changes/bug2355 @@ -0,0 +1,8 @@ + o Major features: + - If "UseBridges 1" is set and no bridges are configured, Tor will + now refuse to build any circuits until some bridges are set. + If "UseBridges auto" is set, Tor will use bridges if they are + configured and we are not running as a server, but otherwise + will make circuits as usual. The new default is "auto". Patch + by anonym. +

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 13ec1bf5c2d5195789eaa0a002d021c9693a3b71 Merge: 587cc31 b79d50d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 3 10:47:35 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2355 | 8 ++++++++ doc/tor.1.txt | 10 +++++++--- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 4 files changed, 41 insertions(+), 8 deletions(-) diff --cc src/or/config.c index 988998e,44cecf3..124dcb9 --- a/src/or/config.c +++ b/src/or/config.c @@@ -387,9 -376,8 +387,9 @@@ static config_var_t _option_vars[] = V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), + V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"),

1 0

[tor/maint-0.2.2] Add an "auto" option to UseBridges
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 507c1257a4d9c629fefc2adbad8db73607749734 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:32:38 2011 -0400 Add an "auto" option to UseBridges UseBridges 1 now means "connect only to bridges; if you know no bridges, don't make connections." UseBridges auto means "Use bridges if they are known, and we have no EntryNodes set, and we aren't a server." UseBridges 0 means "don't use bridges." --- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6635cac..44cecf3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -376,7 +376,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), @@ -3232,6 +3232,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall."); + /* XXX023 use autobool instead. */ + if (!strcmp(options->UseBridges_, "auto")) { + options->UseBridges = (options->Bridges && + !server_mode(options) && + !options->EntryNodes); + } else if (!strcmp(options->UseBridges_, "0")) { + options->UseBridges = 0; + } else if (!strcmp(options->UseBridges_, "1")) { + options->UseBridges = 1; + } else { + REJECT("UseBridges must be 0, 1, or auto"); + } + if (options->UseBridges && server_mode(options)) REJECT("Servers must be able to freely connect to the rest " @@ -3566,10 +3579,8 @@ options_validate(or_options_t *old_options, or_options_t *options, if (validate_dir_authorities(options, old_options) < 0) REJECT("Directory authority line did not parse. See logs for details."); - if (options->UseBridges && !options->Bridges) - REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) - REJECT("If you set UseBridges, you must set TunnelDirConns."); + REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..456dce2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,7 +2480,17 @@ typedef struct { * when doing so. */ char *BridgePassword; - int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ + /** Whether we should start all circuits with a bridge. "1" means strictly + * yes, "0" means strictly no, and "auto" means that we do iff any bridges + * are configured, we are not running a server and have not specified a list + * of entry nodes. */ + char *UseBridges_; + /** Effective value of UseBridges. Will be set equally for UseBridges set to + * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are + * configured, we are not running a server and have not specified a list of + * entry nodes. */ + int UseBridges; + config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make

1 0

[tor/maint-0.2.2] Update man page for new UseBridges tristate behaviour.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit 40cfad1b5ae90b06eb74861a4fdc1310f8611111 Author: anonym <anonym(a)lavabit.com> Date: Mon May 30 23:52:02 2011 +0200 Update man page for new UseBridges tristate behaviour. --- doc/tor.1.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1815a8d..8aa32e8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -708,10 +708,14 @@ The following options are useful only for clients (that is, if from the configured bridge authorities when feasible. It will fall back to a direct request if the authority responds with a 404. (Default: 0) -**UseBridges** **0**|**1**:: - When set, Tor will fetch descriptors for each bridge listed in the "Bridge" +**UseBridges** **0**|**1**|**auto**:: + Make Tor fetch descriptors for each bridge listed in the "Bridge" config lines, and use these relays as both entry guards and directory - guards. (Default: 0) + guards. If the option is 1, bridges must be used and if no bridges are + configured Tor will not make any connections until a bridge is configured; + if it's "auto", Tor will use bridges if any are configured, otherwise it + will connect directly to the Tor network; if it's 0, bridges are not used + at all. (Defaults to auto) **UseEntryGuards** **0**|**1**:: If this option is set to 1, we pick a few long-term entry servers, and try

1 0

[tor/maint-0.2.2] Changes file for bug2355.
by nickm＠torproject.org 03 Jun '11

03 Jun '11

commit b79d50dfcc77013329b2fbfd4a84af29a5965b27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 30 23:49:16 2011 -0400 Changes file for bug2355. --- changes/bug2355 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/bug2355 b/changes/bug2355 new file mode 100644 index 0000000..ee0ae4b --- /dev/null +++ b/changes/bug2355 @@ -0,0 +1,8 @@ + o Major features: + - If "UseBridges 1" is set and no bridges are configured, Tor will + now refuse to build any circuits until some bridges are set. + If "UseBridges auto" is set, Tor will use bridges if they are + configured and we are not running as a server, but otherwise + will make circuits as usual. The new default is "auto". Patch + by anonym. +

1 0

r24800: {website} add tor weather to tor-doc-relay. (website/trunk/docs/en)
by Andrew Lewman 03 Jun '11

03 Jun '11

Author: phobos Date: 2011-06-03 00:40:56 +0000 (Fri, 03 Jun 2011) New Revision: 24800 Modified: website/trunk/docs/en/tor-doc-relay.wml Log: add tor weather to tor-doc-relay. Modified: website/trunk/docs/en/tor-doc-relay.wml =================================================================== --- website/trunk/docs/en/tor-doc-relay.wml 2011-06-03 00:35:43 UTC (rev 24799) +++ website/trunk/docs/en/tor-doc-relay.wml 2011-06-03 00:40:56 UTC (rev 24800) @@ -130,7 +130,13 @@ mailing list. It is very low volume, and it will keep you informed of new stable releases. You might also consider subscribing to <a href="<page docs/documentation>#MailingLists">the higher-volume Tor lists</a> - too. + too.</li> + <li><a href="https://weather.torproject.org/">Tor Weather</a> provides + an email notification service to any users who want to monitor the + status of a Tor node. Upon subscribing, you can specify what types of + alerts you would like to receive. The main purpose of Tor Weather is + to notify node operators via email if their node is down for longer + than a specified period, but other notification types are available. </li> </li></ol>

1 0

r24799: {website} complete ticket #3308. (website/trunk/docs/en)
by Andrew Lewman 03 Jun '11

03 Jun '11

Author: phobos Date: 2011-06-03 00:35:43 +0000 (Fri, 03 Jun 2011) New Revision: 24799 Modified: website/trunk/docs/en/verifying-signatures.wml Log: complete ticket #3308. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-06-01 02:26:46 UTC (rev 24798) +++ website/trunk/docs/en/verifying-signatures.wml 2011-06-03 00:35:43 UTC (rev 24799) @@ -36,6 +36,7 @@ <li>Karsten's (0xF7C11265) signs the metrics archives and tools.</li> <li>Robert Hogan's (0x22F6856F) signs torsocks release tarballs and tags.</li> <li>Nathan's (0xB374CBD2) signs the Android APK file for Orbot.</li>. + <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives</li> </ul> <h3>Step Zero: Install GnuPG</h3> @@ -175,6 +176,10 @@ uid Nathan of Guardian <nathan(a)guardianproject.info> sub 4096g/B5878C3B 2010-06-09 [expires: 2011-06-09] + pub 2048R/886DDD89 2009-09-04 [expires: 2014-09-03] + Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 + uid deb.torproject.org archive signing key + sub 2048R/219EC810 2009-09-04 [expires: 2012-09-03] </pre> <h3>Step Three: Verify the downloaded package</h3>

1 0

[tor/master] Make last_hid_serv_requests functions less fragile
by nickm＠torproject.org 02 Jun '11

02 Jun '11

commit a1d866edc9af82c2134590f7ee3c4e18156a655c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 2 02:24:18 2011 -0700 Make last_hid_serv_requests functions less fragile Previously, Tor would dereference a NULL pointer and crash if lookup_last_hid_serv_request were called before the first call to directory_clean_last_hid_serv_requests. As far as I can tell, that's currently impossible, but I want that undocumented invariant to go away in case I^Wwe break it someday. --- src/or/rendclient.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 29b9d26..ec6e3f2 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -377,7 +377,17 @@ rend_client_introduction_acked(origin_circuit_t *circ, * certain queries; keys are strings consisting of base32-encoded * hidden service directory identities and base32-encoded descriptor IDs; * values are pointers to timestamps of the last requests. */ -static strmap_t *last_hid_serv_requests = NULL; +static strmap_t *last_hid_serv_requests_ = NULL; + +/** Returns last_hid_serv_requests_, initializing it to a new strmap if + * necessary. */ +static strmap_t * +get_last_hid_serv_requests(void) +{ + if (!last_hid_serv_requests_) + last_hid_serv_requests_ = strmap_new(); + return last_hid_serv_requests_; +} /** Look up the last request time to hidden service directory <b>hs_dir</b> * for descriptor ID <b>desc_id_base32</b>. If <b>set</b> is non-zero, @@ -391,6 +401,7 @@ lookup_last_hid_serv_request(routerstatus_t *hs_dir, char hsdir_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; char hsdir_desc_comb_id[2 * REND_DESC_ID_V2_LEN_BASE32 + 1]; time_t *last_request_ptr; + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); base32_encode(hsdir_id_base32, sizeof(hsdir_id_base32), hs_dir->identity_digest, DIGEST_LEN); tor_snprintf(hsdir_desc_comb_id, sizeof(hsdir_desc_comb_id), "%s%s", @@ -416,8 +427,7 @@ directory_clean_last_hid_serv_requests(void) { strmap_iter_t *iter; time_t cutoff = time(NULL) - REND_HID_SERV_DIR_REQUERY_PERIOD; - if (!last_hid_serv_requests) - last_hid_serv_requests = strmap_new(); + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); for (iter = strmap_iter_init(last_hid_serv_requests); !strmap_iter_done(iter); ) { const char *key;

1 0