tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

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

21 Jun '18

commit a0dc3035ef15be6f63fee028b18c9028d1cb0585 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 13:48:46 2018 +0000 Update translations for tails-greeter-2 --- fi/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/fi.po b/fi/fi.po index 274ef5a64..1fe3d4691 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 20:26+0100\n" +"POT-Creation-Date: 2018-05-07 19:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jarkko Nabb <syrinx78(a)gmail.com>, 2018\n" "Language-Team: Finnish (https://www.transifex.com/otf/teams/1519/fi/)\n"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 21 Jun '18

21 Jun '18

commit a27f0c00f2fbfb0ac0178075fd9e5e7d1c29a1f5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 13:46:26 2018 +0000 Update translations for mat-gui_completed --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index 565115504..f9d3b8316 100644 --- a/fi.po +++ b/fi.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Kai Ne <nebasalny(a)gmail.com>\n" +"PO-Revision-Date: 2018-06-21 13:29+0000\n" +"Last-Translator: Panu Ahvenharju <panu.ahvenharju(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 21 Jun '18

21 Jun '18

commit 4074f5aa7bccd8ad43331a552834cf858d1c9cfd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 13:46:21 2018 +0000 Update translations for mat-gui --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index 565115504..f9d3b8316 100644 --- a/fi.po +++ b/fi.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Kai Ne <nebasalny(a)gmail.com>\n" +"PO-Revision-Date: 2018-06-21 13:29+0000\n" +"Last-Translator: Panu Ahvenharju <panu.ahvenharju(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] Fix distcheck by naming header properly.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 874ba6861a02401f4f2d6d2f0e5bdf806386f50b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:37:32 2018 -0400 Fix distcheck by naming header properly. --- src/common/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/include.am b/src/common/include.am index 93fef6b93..8afec9c05 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -203,7 +203,7 @@ COMMONHEADERS = \ src/common/testsupport.h \ src/common/timers.h \ src/common/token_bucket.h \ - src/common/torerr.c \ + src/common/torerr.h \ src/common/torint.h \ src/common/torlog.h \ src/common/tortls.h \

1 0

[tor/master] Bug 26214: Check stream SENDME against max.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit dc397f9a61e2e2caeea1acd46beab0e7205eaa9f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:42:35 2018 +0000 Bug 26214: Check stream SENDME against max. --- src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index e106ec66f..db8f9544f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -929,6 +929,7 @@ typedef enum { /** Initial value on both sides of a stream transmission window when the * stream is initialized. Measured in cells. */ #define STREAMWINDOW_START 500 +#define STREAMWINDOW_START_MAX 500 /** Amount to increment a stream window when we get a stream SENDME. */ #define STREAMWINDOW_INCREMENT 50 diff --git a/src/or/relay.c b/src/or/relay.c index 50f59d6b9..3632678af 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1752,8 +1752,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, circuit_resume_edge_reading(circ, layer_hint); /* We count circuit-level sendme's as valid delivered data because - * they are rate limited. Note that we cannot count stream - * sendme's because the other end could send as many as they like. + * they are rate limited. */ if (CIRCUIT_IS_ORIGIN(circ)) { circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), @@ -1783,6 +1782,27 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, rh.stream_id); return 0; } + + /* Don't allow the other endpoint to request more than our maximim + * (ie initial) stream SENDME window worth of data. Well-behaved + * stock clients will not request more than this max (as per the check + * in the while loop of connection_edge_consider_sending_sendme()). + */ + if (conn->package_window + STREAMWINDOW_INCREMENT > + STREAMWINDOW_START_MAX) { + static struct ratelim_t stream_warn_ratelim = RATELIM_INIT(600); + log_fn_ratelim(&stream_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Unexpected stream sendme cell. Closing circ (window %d).", + conn->package_window); + return -END_CIRC_REASON_TORPROTOCOL; + } + + /* At this point, the stream sendme is valid */ + if (CIRCUIT_IS_ORIGIN(circ)) { + circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), + rh.length); + } + conn->package_window += STREAMWINDOW_INCREMENT; log_debug(domain,"stream-level sendme, packagewindow now %d.", conn->package_window);

1 0

[tor/master] Bug 26214: Changes file.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 11d993869447d08a3fe4ab3b36d34fc53aa21ba1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun May 27 01:43:19 2018 +0000 Bug 26214: Changes file. --- changes/bug26214 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26214 b/changes/bug26214 new file mode 100644 index 000000000..4277b9c6e --- /dev/null +++ b/changes/bug26214 @@ -0,0 +1,3 @@ + o Minor bugfixes (correctness, flow control): + - Upon receiving a stream-level SENDME cell, verify that our window has + not grown too large. Fixes bug 26214; bugfix on svn r54 (pre-0.0.1)

1 0

[tor/master] Merge branch 'mikeperry_bug26214-rebased_squashed'
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 2ad062ee601bc30594b81a33404662fbd59ef8b1 Merge: d46969e82 46b06cd69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:20:03 2018 -0400 Merge branch 'mikeperry_bug26214-rebased_squashed' changes/bug26214 | 3 +++ src/or/or.h | 1 + src/or/relay.c | 24 ++++++++++++++++++++++-- src/test/test_relaycell.c | 17 ++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-)

1 0

[tor/master] Bug 26214: Test updates.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 46b06cd6999439608f4a8a34bb68f6fe6a6311e9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jun 19 19:53:58 2018 +0000 Bug 26214: Test updates. --- src/test/test_relaycell.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 841174982..1bd17b73b 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -240,11 +240,26 @@ test_circbw_relay(void *arg) circ->cpath); ASSERT_UNCOUNTED_BW(); - /* Sendme on stream: not counted */ + /* Sendme on valid stream: counted */ ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, circ->cpath); + ASSERT_COUNTED_BW(); + + /* Sendme on valid stream with full window: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + edgeconn->package_window = 500; + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, + circ->cpath); + ASSERT_UNCOUNTED_BW(); + + /* Sendme on unknown stream: not counted */ + ENTRY_TO_CONN(entryconn)->outbuf_flushlen = 0; + PACK_CELL(1, RELAY_COMMAND_SENDME, "Data1234"); + connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), NULL, + circ->cpath); ASSERT_UNCOUNTED_BW(); /* Sendme on circuit with full window: not counted */

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Jun '18

21 Jun '18

commit b1652ae9a6592f0efafaf002117e081572a57295 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 21 13:16:37 2018 +0000 Update translations for tor-launcher-network-settings --- pt/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd index f0576fdb4..b0b6e520c 100644 --- a/pt/network-settings.dtd +++ b/pt/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor"> <!ENTITY torsettings.wizard.title.default "Ligar ao Tor"> <!ENTITY torsettings.wizard.title.configure "Definições da Rede Tor"> -<!ENTITY torsettings.wizard.title.connecting "A Estabelecer a Ligação"> +<!ENTITY torsettings.wizard.title.connecting "Estabelecer uma Ligação">  <!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor">

1 0

[tor/maint-0.3.4] Hang on; this branch is supposed to be 0.3.4.2-alpha-dev.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 92ae9bb95b6275dfeb28f9aee424c1147365ed4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:01:00 2018 -0400 Hang on; this branch is supposed to be 0.3.4.2-alpha-dev. --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 606bceeda..9a4b0ef39 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.0-alpha-dev]) +AC_INIT([tor],[0.3.4.2-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c9822790b..8181c9424 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.5.0-alpha-dev" +!define VERSION "0.3.4.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 65a905deb..a201a76ac 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.0-alpha-dev" +#define VERSION "0.3.4.2-alpha-dev"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018