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

[tor/master] Bug 24769: Reduce and parameterize the max number of cbt circs.
by nickm＠torproject.org 14 Feb '18

14 Feb '18

commit ac1a78b977596d82138faeecd53e3cf371cbea1d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 31 17:07:07 2018 +0000 Bug 24769: Reduce and parameterize the max number of cbt circs. Setting the default for this at 10 and the learning timeout to 3 minutes means we will complete our cbt learning in 30 minutes, which is under the reduced padding connection timeout window. --- src/or/circuituse.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3a14a3ccf..215ff0d97 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1179,15 +1179,11 @@ needs_hs_client_circuits(time_t now, int *needs_uptime, int *needs_capacity, router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN); } -/* The minimum number of open slots we should keep in order to preemptively - * build circuits. */ -#define CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS 2 - -/* Check to see if we need more circuits to have a good build timeout. However, - * leave a couple slots open so that we can still build circuits preemptively - * as needed. */ -#define CBT_MAX_UNUSED_OPEN_CIRCUITS (MAX_UNUSED_OPEN_CIRCUITS - \ - CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS) +/* This is how many circuits can be opened concurrently during the cbt learning + * phase. This number cannot exceed the tor-wide MAX_UNUSED_OPEN_CIRCUITS. */ +#define DFLT_CBT_UNUSED_OPEN_CIRCS (10) +#define MIN_CBT_UNUSED_OPEN_CIRCS 0 +#define MAX_CBT_UNUSED_OPEN_CIRCS MAX_UNUSED_OPEN_CIRCUITS /* Return true if we need more circuits for a good build timeout. * XXXX make the assumption that build timeout streams should be @@ -1196,7 +1192,10 @@ STATIC int needs_circuits_for_build(int num) { if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) { - if (num < CBT_MAX_UNUSED_OPEN_CIRCUITS && + if (num < networkstatus_get_param(NULL, "cbtmaxopencircs", + DFLT_CBT_UNUSED_OPEN_CIRCS, + MIN_CBT_UNUSED_OPEN_CIRCS, + MAX_CBT_UNUSED_OPEN_CIRCS) && !circuit_build_times_disabled(get_options()) && circuit_build_times_needs_circuits_now(get_circuit_build_times())) { return 1;

1 0

[torspec/master] Adjust cbtlearntimeout default to match the code
by nickm＠torproject.org 14 Feb '18

14 Feb '18

commit 9ea9d7c7aea6ef9997e37dca3f8bc840287fb9cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 14 10:06:47 2018 -0500 Adjust cbtlearntimeout default to match the code --- path-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index 1e1dfbc..0122dc5 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -547,7 +547,7 @@ of their choices. in milliseconds. cbtlearntimeout - Default: 360 + Default: 180 Min: 10 Max: 60000 Effect: This is how long idle circuits will be kept open while cbt is

1 0

[torspec/master] Document new consensus params for bug24769.
by nickm＠torproject.org 14 Feb '18

14 Feb '18

commit b9700afd49968b31367041624d5fdfb83b4ed7ee Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 31 17:19:48 2018 +0000 Document new consensus params for bug24769. --- dir-spec.txt | 7 ++++--- path-spec.txt | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index ece2991..39355d7 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1871,9 +1871,10 @@ "cbtdisabled", "cbtnummodes", "cbtrecentcount", "cbtmaxtimeouts", "cbtmincircs", "cbtquantile", "cbtclosequantile", "cbttestfreq", - "cbtmintimeout", and "cbtinitialtimeout" -- see "2.4.5. Consensus - parameters governing behavior" in path-spec.txt for a series of - circuit build time related consensus params. + "cbtmintimeout", "cbtlearntimeout", "cbtmaxopencircs", and + "cbtinitialtimeout" -- see "2.4.5. Consensus parameters governing + behavior" in path-spec.txt for a series of circuit build time related + consensus params. "UseOptimisticData" -- If set to zero, clients by default shouldn't try to send optimistic data to servers until they have diff --git a/path-spec.txt b/path-spec.txt index 6e88cb3..1e1dfbc 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -546,6 +546,19 @@ of their choices. Effect: This is the timeout value to use before computing a timeout, in milliseconds. + cbtlearntimeout + Default: 360 + Min: 10 + Max: 60000 + Effect: This is how long idle circuits will be kept open while cbt is + learning a new timeout value. + + cbtmaxopencircs + Default: 10 + Min: 0 + Max: 14 + Effect: This is the maximum number of circuits that can be open at + at the same time during the circuit build time learning phase. 2.5. Handling failure

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 22cde7fc98a8ea0046e1727a2271698d60691d72 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 14 00:49:12 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- fr/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 1a377a68b..ac44ef513 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -37,10 +37,10 @@ <!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> -<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre Plus sûr :"> +<!ENTITY torbutton.prefs.sec_safer_list_label "Au réglage Plus sûr :"> <!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr"> <!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre Le plus sûr :"> +<!ENTITY torbutton.prefs.sec_safest_list_label "Au réglage Le plus sûr :"> <!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé pour les sites non HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut pour tous les sites.">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 57180fa78f127c4eb6213db33d5a14e8f4263fa9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 14 00:49:04 2018 +0000 Update translations for torbutton-torbuttondtd --- fr/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torbutton.dtd b/fr/torbutton.dtd index 1a377a68b..ac44ef513 100644 --- a/fr/torbutton.dtd +++ b/fr/torbutton.dtd @@ -37,10 +37,10 @@ <!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> -<!ENTITY torbutton.prefs.sec_safer_list_label "Au paramètre Plus sûr :"> +<!ENTITY torbutton.prefs.sec_safer_list_label "Au réglage Plus sûr :"> <!ENTITY torbutton.prefs.sec_safest_label "Le plus sûr"> <!ENTITY torbutton.prefs.sec_safest_description "Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "Au paramètre Le plus sûr :"> +<!ENTITY torbutton.prefs.sec_safest_list_label "Au réglage Le plus sûr :"> <!ENTITY torbutton.prefs.sec_learn_more_label "En apprendre davantage"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript est désactivé pour les sites non HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript est désactivé par défaut pour tous les sites.">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 966ca75f72be210a84ff4d1b12c013958f8433ac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 14 00:45:29 2018 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 84db8b822..fdb74e0de 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-02-13 21:04+0000\n" +"PO-Revision-Date: 2018-02-14 00:32+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Feb '18

14 Feb '18

commit 0af9edab53679f764e8ee875d050408bc27cdda0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 14 00:45:22 2018 +0000 Update translations for torcheck --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 84db8b822..fdb74e0de 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-02-13 21:04+0000\n" +"PO-Revision-Date: 2018-02-14 00:32+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[bridgedb/develop] Add script for assigning unallocated bridges to another distributor.
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 3095c905600431cc3c0f52885cc8ad219228fafe Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 14 00:25:48 2018 +0000 Add script for assigning unallocated bridges to another distributor. * FIXES #25246: https://bugs.torproject.org/25246 --- scripts/assign-reserve-bridges.py | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/scripts/assign-reserve-bridges.py b/scripts/assign-reserve-bridges.py new file mode 100755 index 0000000..0585634 --- /dev/null +++ b/scripts/assign-reserve-bridges.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013-2018 Isis Lovecruft +# (c) 2007-2018, The Tor Project, Inc. +# (c) 2007-2018, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +"""Assign all unallocated bridges to another distributor.""" + +from __future__ import print_function + +import argparse +import logging + +import bridgedb.Storage + +#: The path to the sqlite database file containing bridges. +DB_FILENAME = "bridgedist.db.sqlite" + +logger = logging.getLogger("assign-reserve-bridges") +logger.setLevel(logging.DEBUG) + +def setDBFilename(filename): + global DB_FILENAME + DB_FILENAME = filename + +def getDBFilename(): + return DB_FILENAME + +def getOptions(): + parser = argparse.ArgumentParser() + parser.add_argument( + "distributor", type=type(''), + help="The new distributor to assign the unallocated bridges to") + parser.add_argument( + "-f", "--db-filename", type=type(''), + help="The path to the database file") + + return parser.parse_args() + +def checkOptions(options): + assert options.distributor + assert options.distributor in ["https", "email", "moat"] + return options + +def getDB(): + return bridgedb.Storage.Database(getDBFilename()) + +def assignBridgesToDistributor(db, distributor): + unallocated = db.getBridgesForDistributor('unallocated') + + logging.info("Assigning %d unallocated bridges to distributor %s" + % (len(unallocated), distributor)) + print("Assigning %d unallocated bridges to distributor %s" + % (len(unallocated), distributor)) + + for bridge in unallocated: + db.updateDistributorForHexKey(distributor, bridge.hex_key) + db.commit() + + remaining_bridges = db.getBridgesForDistributor('unallocated') + assert len(remaining_bridges) == 0 + + logging.info("Done!") + print("Done!") + + +if __name__ == "__main__": + options = checkOptions(getOptions()) + + if options.db_filename: + setDBFilename(options.db_filename) + + db = getDB() + + assignBridgesToDistributor(db, options.distributor)

1 0

[bridgedb/develop] Merge branch 'feature/25246' into develop
by isis＠torproject.org 14 Feb '18

14 Feb '18

commit 37e126f3768c2d6a6295b782fff4ea75b90e895f Merge: c970e64 3095c90 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 14 00:29:35 2018 +0000 Merge branch 'feature/25246' into develop scripts/assign-reserve-bridges.py | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)

1 0

[tor/master] Add a "make test-rust" target to run the rust tests only.
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 549a450f52124405eb75b781fc1686e81461327b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 8 17:51:57 2018 -0500 Add a "make test-rust" target to run the rust tests only. --- changes/ticket25071 | 4 ++++ src/test/include.am | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket25071 b/changes/ticket25071 new file mode 100644 index 000000000..5e2917e10 --- /dev/null +++ b/changes/ticket25071 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Add a "make test-rust" target to run the rust tests only. + Closes ticket 25071. + diff --git a/src/test/include.am b/src/test/include.am index 9783f93d5..fd70cc345 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -358,3 +358,5 @@ EXTRA_DIST += \ src/test/test_workqueue_pipe2.sh \ src/test/test_workqueue_socketpair.sh +test-rust: + $(TESTS_ENVIRONMENT) $(abs_top_srcdir)/src/test/test_rust.sh

1 0