May 2017 - tor-commits - lists.torproject.org

[tor/master] simplify functions now that they don't use options param
by arma＠torproject.org 11 May '17

11 May '17

commit 466e27feaebf0bb7a1c906b733a0da2328b21330 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:57:35 2017 -0400 simplify functions now that they don't use options param --- src/or/networkstatus.c | 4 +--- src/or/networkstatus.h | 3 +-- src/or/nodelist.c | 15 +++++++-------- src/or/routerlist.c | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index aef17be..bd106fd 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2469,10 +2469,8 @@ networkstatus_parse_flavor_name(const char *flavname) * running, or otherwise not a descriptor that we would make any * use of even if we had it. Else return 1. */ int -client_would_use_router(const routerstatus_t *rs, time_t now, - const or_options_t *options) +client_would_use_router(const routerstatus_t *rs, time_t now) { - (void) options; /* unused */ if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. * (Fetching and storing depends on by we_want_to_fetch_flavor().) */ diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 7d148b4..37a5a3b 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -76,8 +76,7 @@ int should_delay_dir_fetches(const or_options_t *options,const char **msg_out); void update_networkstatus_downloads(time_t now); void update_certificate_downloads(time_t now); int consensus_is_waiting_for_certs(void); -int client_would_use_router(const routerstatus_t *rs, time_t now, - const or_options_t *options); +int client_would_use_router(const routerstatus_t *rs, time_t now); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus,(void)); MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, (consensus_flavor_t f)); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index dc4d9a6..e24261b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -74,7 +74,6 @@ static void count_usable_descriptors(int *num_present, int *num_usable, smartlist_t *descs_out, const networkstatus_t *consensus, - const or_options_t *options, time_t now, routerset_t *in_set, usable_descriptor_t exit_only); @@ -1690,7 +1689,7 @@ static void count_usable_descriptors(int *num_present, int *num_usable, smartlist_t *descs_out, const networkstatus_t *consensus, - const or_options_t *options, time_t now, + time_t now, routerset_t *in_set, usable_descriptor_t exit_only) { @@ -1707,7 +1706,7 @@ count_usable_descriptors(int *num_present, int *num_usable, continue; if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1)) continue; - if (client_would_use_router(rs, now, options)) { + if (client_would_use_router(rs, now)) { const char * const digest = rs->descriptor_digest; int present; ++*num_usable; /* the consensus says we want it. */ @@ -1761,10 +1760,10 @@ compute_frac_paths_available(const networkstatus_t *consensus, const int authdir = authdir_mode_v3(options); count_usable_descriptors(num_present_out, num_usable_out, - mid, consensus, options, now, NULL, + mid, consensus, now, NULL, USABLE_DESCRIPTOR_ALL); if (options->EntryNodes) { - count_usable_descriptors(&np, &nu, guards, consensus, options, now, + count_usable_descriptors(&np, &nu, guards, consensus, now, options->EntryNodes, USABLE_DESCRIPTOR_ALL); } else { SMARTLIST_FOREACH(mid, const node_t *, node, { @@ -1785,7 +1784,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, * an unavoidable feature of forcing authorities to declare * certain nodes as exits. */ - count_usable_descriptors(&np, &nu, exits, consensus, options, now, + count_usable_descriptors(&np, &nu, exits, consensus, now, NULL, USABLE_DESCRIPTOR_EXIT_ONLY); log_debug(LD_NET, "%s: %d present, %d usable", @@ -1834,7 +1833,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, smartlist_t *myexits_unflagged = smartlist_new(); /* All nodes with exit flag in ExitNodes option */ - count_usable_descriptors(&np, &nu, myexits, consensus, options, now, + count_usable_descriptors(&np, &nu, myexits, consensus, now, options->ExitNodes, USABLE_DESCRIPTOR_EXIT_ONLY); log_debug(LD_NET, "%s: %d present, %d usable", @@ -1845,7 +1844,7 @@ compute_frac_paths_available(const networkstatus_t *consensus, /* Now compute the nodes in the ExitNodes option where which we don't know * what their exit policy is, or we know it permits something. */ count_usable_descriptors(&np, &nu, myexits_unflagged, - consensus, options, now, + consensus, now, options->ExitNodes, USABLE_DESCRIPTOR_ALL); log_debug(LD_NET, "%s: %d present, %d usable", diff --git a/src/or/routerlist.c b/src/or/routerlist.c index cba0d92..a790265 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5142,7 +5142,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, continue; /* We would throw it out immediately. */ } if (!we_want_to_fetch_flavor(options, consensus->flavor) && - !client_would_use_router(rs, now, options)) { + !client_would_use_router(rs, now)) { ++n_wouldnt_use; continue; /* We would never use it ourself. */ }

1 0

[tor/master] Merge branch 'maint-0.3.0'
by arma＠torproject.org 11 May '17

11 May '17

commit 2330a3713da668bf8c171490af8c414a46a74001 Merge: 1a497dc 716d485 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:36:34 2017 -0400 Merge branch 'maint-0.3.0' src/or/networkstatus.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/master] resolve now-unused parameter from #21642 fix
by arma＠torproject.org 11 May '17

11 May '17

commit 716d48581de72e5773c15802df5ca66b5f7365e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:35:36 2017 -0400 resolve now-unused parameter from #21642 fix --- src/or/networkstatus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 26c388c..1fd0772 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2444,6 +2444,7 @@ int client_would_use_router(const routerstatus_t *rs, time_t now, const or_options_t *options) { + (void) options; /* unused */ if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. * (Fetching and storing depends on by we_want_to_fetch_flavor().) */

1 0

[tor/release-0.3.0] resolve now-unused parameter from #21642 fix
by arma＠torproject.org 11 May '17

11 May '17

commit 716d48581de72e5773c15802df5ca66b5f7365e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:35:36 2017 -0400 resolve now-unused parameter from #21642 fix --- src/or/networkstatus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 26c388c..1fd0772 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2444,6 +2444,7 @@ int client_would_use_router(const routerstatus_t *rs, time_t now, const or_options_t *options) { + (void) options; /* unused */ if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. * (Fetching and storing depends on by we_want_to_fetch_flavor().) */

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by arma＠torproject.org 11 May '17

11 May '17

commit f8f34a82201a7a1ddea399b1a74e4f9181ab1873 Merge: 6758549 716d485 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:36:14 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/or/networkstatus.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/maint-0.3.0] resolve now-unused parameter from #21642 fix
by arma＠torproject.org 11 May '17

11 May '17

commit 716d48581de72e5773c15802df5ca66b5f7365e5 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:35:36 2017 -0400 resolve now-unused parameter from #21642 fix --- src/or/networkstatus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 26c388c..1fd0772 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2444,6 +2444,7 @@ int client_would_use_router(const routerstatus_t *rs, time_t now, const or_options_t *options) { + (void) options; /* unused */ if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. * (Fetching and storing depends on by we_want_to_fetch_flavor().) */

1 0

[webwml/master] fix answer about torrc location on tor browser for macOS
by arma＠torproject.org 11 May '17

11 May '17

commit 78825462f6af8883d3de3fb7f7eaa5b33d7671bb Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 10 17:05:51 2017 -0400 fix answer about torrc location on tor browser for macOS fix comes mostly from pastly (thanks!) --- docs/en/faq.wml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 4a769c2..a97dffd 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -1525,15 +1525,19 @@ instructions for how your Tor program should behave. The default configuration should work fine for most Tor users. -If you installed Tor Browser, look for +If you installed Tor Browser on Windows or Linux, look for <code>Browser/TorBrowser/Data/Tor/torrc</code> inside your Tor Browser directory. -On OS X, you must right-click or command-click on the Tor Browser icon, -and select "Show Package Contents" before the Tor Browser directories become -visible. +If you're on macOS, the torrc is in <code>~/Library/Application Support/TorBrowser-Data/Tor</code> . +To get to it, press cmd-shift-g while in Finder and copy/paste that directory +into the box that appears. -Tor looks for the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package. +Otherwise, if you are using Tor without Tor Browser, it looks for the +torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor +from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> +if you installed a pre-built package. + Once you've created or changed your torrc file, you will need to restart

1 0

[tor/maint-0.3.0] Stop declining to download microdescs with future published times.
by nickm＠torproject.org 10 May '17

10 May '17

commit 85cf6dcba3693bbd1264e5fae05346ddf1909b85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 6 15:37:01 2017 -0500 Stop declining to download microdescs with future published times. This change is the only one necessary to allow future versions of the microdescriptor consensus to replace every 'published' date with e.g. 2038-01-01 00:00:00; this will save 50-75% in compressed microdescriptor diff size, which is quite significant. This commit is a minimal change for 0.2.9; future series will reduce the use of the 'published' date even more. Implements part of ticket 21642; implements part of proposal 275. --- changes/prop275-minimal | 9 +++++++++ src/or/networkstatus.c | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/prop275-minimal b/changes/prop275-minimal new file mode 100644 index 0000000..83d42f8 --- /dev/null +++ b/changes/prop275-minimal @@ -0,0 +1,9 @@ + o Minor features (future-proofing): + + - Tor no longer refuses to download microdescriptors or descriptors if + they are listed as "published in the future". This change will + eventually allow us to stop listing meaningful "published" dates + in microdescriptor consensuses, and thereby allow us to reduce the + resources required to download consensus diffs by over 50%. + Implements part of ticket 21642; implements part of proposal 275. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2d39c90..991cf80 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2360,11 +2360,6 @@ client_would_use_router(const routerstatus_t *rs, time_t now, * But, if we want to have a complete list, fetch it anyway. */ return 0; } - if (rs->published_on + options->TestingEstimatedDescriptorPropagationTime - > now) { - /* Most caches probably don't have this descriptor yet. */ - return 0; - } if (rs->published_on + OLD_ROUTER_DESC_MAX_AGE < now) { /* We'd drop it immediately for being too old. */ return 0;

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 10 May '17

10 May '17

commit 1a497dcd1e43913042ed5b11d4c9466ea1956399 Merge: ee3ccd2 a868b84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 16:28:07 2017 -0400 Merge branch 'maint-0.3.0' changes/prop275-minimal | 9 +++++++++ src/or/networkstatus.c | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 10 May '17

10 May '17

commit a868b84599b7591442f40b40b0187c83e8f999b1 Merge: d792d2a 8f5da80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 10 16:27:15 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/prop275-minimal | 9 +++++++++ src/or/networkstatus.c | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --cc src/or/networkstatus.c index 508cf6c,991cf80..26c388c --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -2444,16 -2355,11 +2444,11 @@@ in client_would_use_router(const routerstatus_t *rs, time_t now, const or_options_t *options) { - if (!rs->is_flagged_running && !options->FetchUselessDescriptors) { + if (!rs->is_flagged_running) { /* If we had this router descriptor, we wouldn't even bother using it. - * But, if we want to have a complete list, fetch it anyway. */ + * (Fetching and storing depends on by we_want_to_fetch_flavor().) */ return 0; } - if (rs->published_on + options->TestingEstimatedDescriptorPropagationTime - > now) { - /* Most caches probably don't have this descriptor yet. */ - return 0; - } if (rs->published_on + OLD_ROUTER_DESC_MAX_AGE < now) { /* We'd drop it immediately for being too old. */ return 0;

1 0