October 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5dbdca011454d1d6c9e83bcc1a970ec3c4f368da Merge: 5c8ecf364 0a5ce8280 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:45:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2 src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.2] err: Use the correct type for cb_buf
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 0a5ce8280c7b7e4121237db5a29ea9e0084ffb05 Author: teor <teor(a)torproject.org> Date: Sun Oct 20 20:01:56 2019 +1000 err: Use the correct type for cb_buf Fixes bug 32060; bug not in any released version of tor. Resolves CID 1454761. --- src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index bc3ca286e..ce8ddcd7c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -85,7 +85,7 @@ static pthread_mutex_t cb_buf_mutex = PTHREAD_MUTEX_INITIALIZER; /** Lock and return a static stack pointer buffer that can hold up to * MAX_DEPTH function pointers. */ -static void * +static void ** lock_cb_buf(void) { /* Lock the mutex first, before even declaring the buffer. */ @@ -102,7 +102,7 @@ lock_cb_buf(void) /** Unlock the static stack pointer buffer. */ static void -unlock_cb_buf(void *cb_buf) +unlock_cb_buf(void **cb_buf) { memset(cb_buf, 0, SIZEOF_CB_BUF); pthread_mutex_unlock(&cb_buf_mutex); @@ -149,7 +149,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, char **symbols; size_t i; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int)depth); @@ -183,7 +183,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) int n_fds, i; const int *fds = NULL; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); (void) si; @@ -214,7 +214,7 @@ dump_stack_symbols_to_error_fds(void) const int *fds = NULL; size_t depth; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); @@ -256,7 +256,7 @@ install_bt_handler(void) * libc has pre-loaded the symbols we need to dump things, so that later * reads won't be denied by the sandbox code */ char **symbols; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); size_t depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5dbdca011454d1d6c9e83bcc1a970ec3c4f368da Merge: 5c8ecf364 0a5ce8280 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:45:18 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2 src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/master] err: Use the correct type for cb_buf
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 0a5ce8280c7b7e4121237db5a29ea9e0084ffb05 Author: teor <teor(a)torproject.org> Date: Sun Oct 20 20:01:56 2019 +1000 err: Use the correct type for cb_buf Fixes bug 32060; bug not in any released version of tor. Resolves CID 1454761. --- src/lib/err/backtrace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index bc3ca286e..ce8ddcd7c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -85,7 +85,7 @@ static pthread_mutex_t cb_buf_mutex = PTHREAD_MUTEX_INITIALIZER; /** Lock and return a static stack pointer buffer that can hold up to * MAX_DEPTH function pointers. */ -static void * +static void ** lock_cb_buf(void) { /* Lock the mutex first, before even declaring the buffer. */ @@ -102,7 +102,7 @@ lock_cb_buf(void) /** Unlock the static stack pointer buffer. */ static void -unlock_cb_buf(void *cb_buf) +unlock_cb_buf(void **cb_buf) { memset(cb_buf, 0, SIZEOF_CB_BUF); pthread_mutex_unlock(&cb_buf_mutex); @@ -149,7 +149,7 @@ log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, char **symbols; size_t i; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int)depth); @@ -183,7 +183,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) int n_fds, i; const int *fds = NULL; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); (void) si; @@ -214,7 +214,7 @@ dump_stack_symbols_to_error_fds(void) const int *fds = NULL; size_t depth; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); depth = backtrace(cb_buf, MAX_DEPTH); @@ -256,7 +256,7 @@ install_bt_handler(void) * libc has pre-loaded the symbols we need to dump things, so that later * reads won't be denied by the sandbox code */ char **symbols; - void *cb_buf = lock_cb_buf(); + void **cb_buf = lock_cb_buf(); size_t depth = backtrace(cb_buf, MAX_DEPTH); symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols)

1 0

[tor/master] test/rebind: Make control formatting and log parsing more robust
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit cf2b00d3f50f3421c3c22777113e25d5f7812e67 Author: teor <teor(a)torproject.org> Date: Tue Aug 6 01:33:14 2019 +1000 test/rebind: Make control formatting and log parsing more robust * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something * backslash-replace bad UTF-8 characters in logs * format control messages as ASCII: tor does not accept UTF-8 control commands Fixes bug 31837; bugfix on 0.3.5.1-alpha. --- changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug31837 b/changes/bug31837 new file mode 100644 index 000000000..0f976edfe --- /dev/null +++ b/changes/bug31837 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When testing port rebinding, don't busy-wait for tor to log. Instead, + actually sleep for a short time before polling again. Also improve the + formatting of control commands and log messages. + Fixes bug 31837; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 45ad1c546..30a587858 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -31,15 +31,17 @@ def wait_for_log(s): cutoff = time.time() + LOG_TIMEOUT while time.time() < cutoff: l = tor_process.stdout.readline() - l = l.decode('utf8') + l = l.decode('utf8', 'backslashreplace') if s in l: logging.info('Tor logged: "{}"'.format(l.strip())) return - logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) # readline() returns a blank string when there is no output # avoid busy-waiting - if len(s) == 0: + if len(l) == 0: + logging.debug('Tor has not logged anything, waiting for "{}"'.format(s)) time.sleep(LOG_WAIT) + else: + logging.info('Tor logged: "{}", waiting for "{}"'.format(l.strip(), s)) fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT)) def pick_random_port(): @@ -119,18 +121,18 @@ if control_socket.connect_ex(('127.0.0.1', control_port)): tor_process.terminate() fail('Cannot connect to ControlPort') -control_socket.sendall('AUTHENTICATE \r\n'.encode('utf8')) -control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('AUTHENTICATE \r\n'.encode('ascii')) +control_socket.sendall('SETCONF SOCKSPort=0.0.0.0:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('utf8')) +control_socket.sendall('SETCONF SOCKSPort=127.0.0.1:{}\r\n'.format(socks_port).encode('ascii')) wait_for_log('Opened Socks listener') try_connecting_to_socksport() -control_socket.sendall('SIGNAL HALT\r\n'.encode('utf8')) +control_socket.sendall('SIGNAL HALT\r\n'.encode('ascii')) wait_for_log('exiting cleanly') logging.info('OK')

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit a1f73cb93da40185f8c8ed055de47e7525e77a3f Merge: 042116e1f 5dbdca011 Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:45:34 2019 +1000 Merge branch 'maint-0.4.2' changes/bug31837 | 5 +++++ src/lib/err/backtrace.c | 12 ++++++------ src/test/test_rebind.py | 16 +++++++++------- 3 files changed, 20 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
by teor＠torproject.org 21 Oct '19

21 Oct '19

commit 5c8ecf364ae667104e63c43f9377601e3c572d9a Merge: 02e3e8eda cf2b00d3f Author: teor <teor(a)torproject.org> Date: Mon Oct 21 09:44:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2 changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit 9c851ab0688854df9c7f8a9575eb97d51e1033bf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 20:52:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sq/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/network-settings.dtd b/sq/network-settings.dtd index 022c7bddb..1250a78ff 100644 --- a/sq/network-settings.dtd +++ b/sq/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> <!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit c03c48b765f840f18a877669c2ee8e3ee7d2ff92 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 19:22:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+ca.po b/contents+ca.po index c184b2e7c..66026442d 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -690,6 +690,8 @@ msgid "" "Also, you should make sure not to confuse your readers about what Tor is, " "who makes it, and what properties it provides (and doesn't provide)." msgstr "" +"També haureu d'assegurar-vos de no confondre els vostres lectors sobre què " +"és el Tor, qui el fa, i quines propietats proporciona (i quines no)." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -697,11 +699,13 @@ msgid "" "See our [trademark FAQ](https://www.torproject.org/about/trademark/) for " "details." msgstr "" +"Mireu les nostres [PMF sobre la " +"marca](https://www.torproject.org/about/trademark/) per a més detalls." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.title) msgid "How is Tor different from other proxies?" -msgstr "" +msgstr "Que fa al Tor diferent d'altres servidors intermediaris?" #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 20 Oct '19

20 Oct '19

commit 1200c304ff911b768e61b54c13296c873fc67f12 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 20 18:53:09 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 1b1597b5b..c184b2e7c 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -600,7 +600,7 @@ msgstr "Sí." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "The Tor software is [free software](https://www.fsf.org/)." -msgstr "" +msgstr "El Tor és [programari lliure](https://www.fsf.org/)." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -608,11 +608,13 @@ msgid "" "This means we give you the rights to redistribute the Tor software, either " "modified or unmodified, either for a fee or gratis." msgstr "" +"Això significa que us donem els drets per a distribuir el programari Tor, " +"tant modificat com sense modificar, tant de pagament com gratis." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "You don't have to ask us for specific permission." -msgstr "" +msgstr "No cal que ens demaneu cap permís en concret." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -620,6 +622,8 @@ msgid "" "However, if you want to redistribute the Tor software you must follow our " "[LICENSE](https://gitweb.torproject.org/tor.git/plain/LICENSE)." msgstr "" +"Tot i això, si voleu redistribuir el Tor, haureu de seguir la nostra " +"[LLICÈNCIA](https://gitweb.torproject.org/tor.git/plain/LICENSE)." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -627,6 +631,8 @@ msgid "" "Essentially this means that you need to include our LICENSE file along with " "whatever part of the Tor software you're distributing." msgstr "" +"En resum, això significa que cal que inclogueu el nostre fitxer de LLICÈNCIA" +" junt amb qualsevol part del programari Tor que distribuïu." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -634,11 +640,13 @@ msgid "" "Most people who ask us this question don't want to distribute just the Tor " "software, though." msgstr "" +"De tota manera, la majoria dels qui ens pregunten sobre això no volen " +"distribuir només el Tor." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "They want to distribute the Tor Browser." -msgstr "" +msgstr "Volen distribuir el Navegador Tor." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -647,11 +655,14 @@ msgid "" "US/firefox/organizations/), and the NoScript and HTTPS-Everywhere " "extensions." msgstr "" +"Això inclou el [Firefox Extended Support Release](https://www.mozilla.org" +"/en-US/firefox/organizations/), i els complements NoScript i HTTPS-" +"Everywhere." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) msgid "You will need to follow the license for those programs as well." -msgstr "" +msgstr "També cal que seguiu la llicència d'aquests programes." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -660,6 +671,9 @@ msgid "" "Public License](https://www.fsf.org/licensing/licenses/gpl.html), while " "Firefox ESR is released under the Mozilla Public License." msgstr "" +"Ambdós complements del Firefox es distribueixen sota la [GNU General Public " +"License](https://www.fsf.org/licensing/licenses/gpl.html); en canvi, el " +"Firefox ESR s'allibera sota la Mozilla Public License." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) @@ -667,6 +681,8 @@ msgid "" "The simplest way to obey their licenses is to include the source code for " "these programs everywhere you include the bundles themselves." msgstr "" +"La forma més senzilla d'obeir les seves llicències és incloure el codi font " +"d'eixos programes a tots els llocs on inclogueu els mateixos programes." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description)

1 0