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

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Jun '18

02 Jun '18

commit 191bdde98f421278af53a341a56a1c10423fba1c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 2 20:47:12 2018 +0000 Update translations for torbutton-torbuttonproperties --- lt/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/torbutton.properties b/lt/torbutton.properties index 9885f05f6..9b90efb53 100644 --- a/lt/torbutton.properties +++ b/lt/torbutton.properties @@ -2,7 +2,7 @@ torbutton.circuit_display.internet = Internetas torbutton.circuit_display.ip_unknown = IP nežinomas torbutton.circuit_display.onion_site = Onion svetainė torbutton.circuit_display.this_browser = Ši naršyklė -torbutton.circuit_display.relay = Relay +torbutton.circuit_display.relay = Retransliavimas torbutton.circuit_display.tor_bridge = Tinklų tiltas torbutton.circuit_display.unknown_country = Nežinoma šalis torbutton.circuit_display.guard = Guard

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jun '18

02 Jun '18

commit d13bfaa34cd97bb7472de85c34af87906047d7ca Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 2 20:45:41 2018 +0000 Update translations for liveusb-creator --- lt/lt.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index 86e9777f9..9b6ce55bd 100644 --- a/lt/lt.po +++ b/lt/lt.po @@ -5,7 +5,7 @@ # Translators: # brdr <evelinaorama(a)gmail.com>, 2015 # Gediminas Golcevas <>, 2014 -# Moo, 2015-2017 +# Moo, 2015-2018 # Rolandas Barysas <inactive+rb(a)transifex.com>, 2013-2014 # Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2016 msgid "" @@ -13,14 +13,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-11-11 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-06-02 20:25+0000\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n" #: ../tails_installer/creator.py:101 msgid "You must run this application as root" @@ -33,7 +33,7 @@ msgstr "" #: ../tails_installer/creator.py:154 #, python-format msgid "Wrote to device at %(speed)d MB/sec" -msgstr "" +msgstr "Įrašyta į įrenginį %(speed)d MB/sek. greičiu" #: ../tails_installer/creator.py:184 msgid "Setting up OLPC boot file..."

1 0

[tor/master] Point reader to a section in tor-spec.txt
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit f8d549db7ba1d0f0f8984f5959e669e2db539d58 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jun 2 11:15:10 2018 +0300 Point reader to a section in tor-spec.txt --- changes/doc25237 | 4 ++++ src/or/or.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/doc25237 b/changes/doc25237 new file mode 100644 index 000000000..c54307a83 --- /dev/null +++ b/changes/doc25237 @@ -0,0 +1,4 @@ + o Documentation: + - In code comment, point the reader to the exact section + in Tor specification that specifies circuit close error + code values. Resolves ticket 25237. diff --git a/src/or/or.h b/src/or/or.h index 750c79fd4..e106ec66f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -728,8 +728,8 @@ typedef enum { /** Catch-all "other" reason for closing origin circuits. */ #define END_CIRC_AT_ORIGIN -1 -/* Reasons why we (or a remote OR) might close a circuit. See tor-spec.txt for - * documentation of these. */ +/* Reasons why we (or a remote OR) might close a circuit. See tor-spec.txt + * section 5.4 for documentation of these. */ #define END_CIRC_REASON_MIN_ 0 #define END_CIRC_REASON_NONE 0 #define END_CIRC_REASON_TORPROTOCOL 1

1 0

[tor/master] Merge remote-tracking branch 'rl1987/doc25237'
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit 3716ddf1b42270b5db76f8b7b458c5f61aa40e23 Merge: 9f884a38e f8d549db7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 2 11:35:06 2018 -0700 Merge remote-tracking branch 'rl1987/doc25237' changes/doc25237 | 4 ++++ src/or/or.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Bug 26121: Improve BUILDTIMEOUT_SET accuracy.
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit fe5764012a05e5d9382e1a59d015ff6ca0bd804b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 16 06:42:41 2018 +0000 Bug 26121: Improve BUILDTIMEOUT_SET accuracy. We were miscounting the total number of circuits for the TIMEOUT_RATE and CLOSE_RATE fields of this event. --- changes/bug26121 | 6 ++++++ src/or/circuitstats.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug26121 b/changes/bug26121 new file mode 100644 index 000000000..5f734dd56 --- /dev/null +++ b/changes/bug26121 @@ -0,0 +1,6 @@ + o Minor bugfixes (controller): + - Improve accuracy of the BUILDTIMEOUT_SET control port event's + TIMEOUT_RATE and CLOSE_RATE fields. (We were previously miscounting + the total number of circuits for these field values.) Fixes bug + 26121; bugfix on 0.3.3.1-alpha. + diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index f87bbd822..f06c2e5e3 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -1908,13 +1908,20 @@ cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, /* The timeout rate is the ratio of the timeout count over * the total number of circuits attempted. The total number of - * circuits is (timeouts+succeeded+closed), since a circuit can - * either timeout, close, or succeed. We cast the denominator + * circuits is (timeouts+succeeded), since every circuit + * either succeeds, or times out. "Closed" circuits are + * MEASURE_TIMEOUT circuits whose measurement period expired. + * All MEASURE_TIMEOUT circuits are counted in the timeouts stat + * before transitioning to MEASURE_TIMEOUT (in + * circuit_build_times_mark_circ_as_measurement_only()). + * MEASURE_TIMEOUT circuits that succeed are *not* counted as + * "succeeded". See circuit_build_times_handle_completed_hop(). + * + * We cast the denominator * to promote it to double before the addition, to avoid int32 * overflow. */ const double total_circuits = - ((double)cbt->num_circ_timeouts) + cbt->num_circ_succeeded - + cbt->num_circ_closed; + ((double)cbt->num_circ_timeouts) + cbt->num_circ_succeeded; if (total_circuits >= 1.0) { timeout_rate = cbt->num_circ_timeouts / total_circuits; close_rate = cbt->num_circ_closed / total_circuits;

1 0

[tor/release-0.3.3] Merge branch 'bug26121-033-squashed' into maint-0.3.3
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit f15f90e2cac50154c761da94eb9fd642890f2777 Merge: fa1890e97 fe5764012 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 2 10:36:44 2018 -0700 Merge branch 'bug26121-033-squashed' into maint-0.3.3 changes/bug26121 | 6 ++++++ src/or/circuitstats.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit 0c9d6177628059f089e8792255b4b16b0caaa857 Merge: db9ca07c4 f15f90e2c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 2 10:42:06 2018 -0700 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26121 | 6 ++++++ src/or/circuitstats.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.3] Bug 26121: Improve BUILDTIMEOUT_SET accuracy.
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit fe5764012a05e5d9382e1a59d015ff6ca0bd804b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 16 06:42:41 2018 +0000 Bug 26121: Improve BUILDTIMEOUT_SET accuracy. We were miscounting the total number of circuits for the TIMEOUT_RATE and CLOSE_RATE fields of this event. --- changes/bug26121 | 6 ++++++ src/or/circuitstats.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug26121 b/changes/bug26121 new file mode 100644 index 000000000..5f734dd56 --- /dev/null +++ b/changes/bug26121 @@ -0,0 +1,6 @@ + o Minor bugfixes (controller): + - Improve accuracy of the BUILDTIMEOUT_SET control port event's + TIMEOUT_RATE and CLOSE_RATE fields. (We were previously miscounting + the total number of circuits for these field values.) Fixes bug + 26121; bugfix on 0.3.3.1-alpha. + diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index f87bbd822..f06c2e5e3 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -1908,13 +1908,20 @@ cbt_control_event_buildtimeout_set(const circuit_build_times_t *cbt, /* The timeout rate is the ratio of the timeout count over * the total number of circuits attempted. The total number of - * circuits is (timeouts+succeeded+closed), since a circuit can - * either timeout, close, or succeed. We cast the denominator + * circuits is (timeouts+succeeded), since every circuit + * either succeeds, or times out. "Closed" circuits are + * MEASURE_TIMEOUT circuits whose measurement period expired. + * All MEASURE_TIMEOUT circuits are counted in the timeouts stat + * before transitioning to MEASURE_TIMEOUT (in + * circuit_build_times_mark_circ_as_measurement_only()). + * MEASURE_TIMEOUT circuits that succeed are *not* counted as + * "succeeded". See circuit_build_times_handle_completed_hop(). + * + * We cast the denominator * to promote it to double before the addition, to avoid int32 * overflow. */ const double total_circuits = - ((double)cbt->num_circ_timeouts) + cbt->num_circ_succeeded - + cbt->num_circ_closed; + ((double)cbt->num_circ_timeouts) + cbt->num_circ_succeeded; if (total_circuits >= 1.0) { timeout_rate = cbt->num_circ_timeouts / total_circuits; close_rate = cbt->num_circ_closed / total_circuits;

1 0

[tor/maint-0.3.3] Merge branch 'bug26121-033-squashed' into maint-0.3.3
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit f15f90e2cac50154c761da94eb9fd642890f2777 Merge: fa1890e97 fe5764012 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 2 10:36:44 2018 -0700 Merge branch 'bug26121-033-squashed' into maint-0.3.3 changes/bug26121 | 6 ++++++ src/or/circuitstats.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'bug25939_034_01_squashed'
by nickm＠torproject.org 02 Jun '18

02 Jun '18

commit 00e150a0e4967f5859f3eecb51fb54104d87335d Merge: d7bbfd0f6 66e76066e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 2 10:33:33 2018 -0700 Merge branch 'bug25939_034_01_squashed' changes/bug25939 | 3 +++ src/or/hs_service.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)

1 0