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

[tor/master] Merge remote-tracking branch 'tor-github/pr/406'
by nickm＠torproject.org 17 Oct '18

17 Oct '18

commit 34cd1fc52396175a98837f856fc59a0c362cb8a2 Merge: 63c5e09a4 5e74db95c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 21:33:38 2018 -0400 Merge remote-tracking branch 'tor-github/pr/406' src/rust/external/external.rs | 3 +-- src/rust/protover/protoset.rs | 2 +- src/rust/protover/protover.rs | 50 ++++++++++++++++++++++--------------------- 3 files changed, 28 insertions(+), 27 deletions(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 Oct '18

16 Oct '18

commit 1be14b22e2a4471e16d5cec8dba00a8a677839eb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 16 23:46:00 2018 +0000 Update translations for tails-misc --- pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index ec17b941f..7d9f62606 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-15 14:47+0200\n" -"PO-Revision-Date: 2018-10-15 14:43+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-10-16 23:40+0000\n" +"Last-Translator: Malkon F <malkon.inf(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -631,11 +631,11 @@ msgstr "{volume_name} – {drive_name}" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222 msgid "Wrong passphrase or parameters" -msgstr "" +msgstr "Senha ou parâmetros incorretos" #: config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224 msgid "Error unlocking volume" -msgstr "" +msgstr "Erro ao desbloquear o volume" #. Translators: Don't translate {volume_name} or {error_message}, #. they are placeholder and will be replaced.

1 0

[tor/master] Fix typo in comment for hs_cell_parse_introduce2()
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit f93ee8e4c49f1274119300bb4983348341109141 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Oct 16 10:59:42 2018 -0400 Fix typo in comment for hs_cell_parse_introduce2() --- src/feature/hs/hs_cell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c index c6ca6746b..9bbae6d32 100644 --- a/src/feature/hs/hs_cell.c +++ b/src/feature/hs/hs_cell.c @@ -620,7 +620,7 @@ hs_cell_parse_intro_established(const uint8_t *payload, size_t payload_len) return ret; } -/* Parsse the INTRODUCE2 cell using data which contains everything we need to +/* Parse the INTRODUCE2 cell using data which contains everything we need to * do so and contains the destination buffers of information we extract and * compute from the cell. Return 0 on success else a negative value. The * service and circ are only used for logging purposes. */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/408'
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit 63c5e09a4093dc72f11c08078fe81c34c5d40ba5 Merge: e97adaf8d f93ee8e4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 19:10:05 2018 -0400 Merge remote-tracking branch 'tor-github/pr/408' src/feature/hs/hs_cell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[chutney/master] Always specify the onion service version
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit a881ebb0d6955e1a7f92e2910b0866a569b9ea44 Author: teor <teor(a)torproject.org> Date: Sat Oct 6 16:38:16 2018 -0500 Always specify the onion service version Tor's #27215 changed the default onion service version to 3. But chutney assumed the default was 2. Closes #27965. --- torrc_templates/hs-common.i | 8 ++++++++ torrc_templates/hs-v2.tmpl | 4 ++++ torrc_templates/hs-v3.tmpl | 4 +++- torrc_templates/hs.tmpl | 14 +++----------- torrc_templates/single-onion-common.i | 21 +++++++++++++++++++++ torrc_templates/single-onion-v2.tmpl | 2 ++ torrc_templates/single-onion-v3.tmpl | 2 +- torrc_templates/single-onion.tmpl | 24 +++--------------------- 8 files changed, 45 insertions(+), 34 deletions(-) diff --git a/torrc_templates/hs-common.i b/torrc_templates/hs-common.i new file mode 100644 index 0000000..63502dc --- /dev/null +++ b/torrc_templates/hs-common.i @@ -0,0 +1,8 @@ +${include:common.i} +SocksPort 0 +Address $ip + +HiddenServiceDir ${dir}/hidden_service + +# Redirect requests to the port used by chutney verify +HiddenServicePort 5858 127.0.0.1:4747 diff --git a/torrc_templates/hs-v2.tmpl b/torrc_templates/hs-v2.tmpl new file mode 100644 index 0000000..62c7173 --- /dev/null +++ b/torrc_templates/hs-v2.tmpl @@ -0,0 +1,4 @@ +${include:hs-common.i} + +# Tor 0.3.4 and earlier default to 2, but 0.3.5 and later default to 3 +HiddenServiceVersion 2 diff --git a/torrc_templates/hs-v3.tmpl b/torrc_templates/hs-v3.tmpl index 27f031f..23db75f 100644 --- a/torrc_templates/hs-v3.tmpl +++ b/torrc_templates/hs-v3.tmpl @@ -1,2 +1,4 @@ -${include:hs.tmpl} +${include:hs-common.i} + +# Tor 0.3.4 and earlier default to 2, but 0.3.5 and later default to 3 HiddenServiceVersion 3 diff --git a/torrc_templates/hs.tmpl b/torrc_templates/hs.tmpl index c1cafd8..253d0bb 100644 --- a/torrc_templates/hs.tmpl +++ b/torrc_templates/hs.tmpl @@ -1,11 +1,3 @@ -${include:common.i} -SocksPort 0 -Address $ip - -HiddenServiceDir ${dir}/hidden_service -# SSH is usually a popular service that is running. This is really just to make -# a quick way to test the HS with torsocks and have an app at the other end. -#HiddenServicePort 6000 127.0.0.1:22 - -# Redirect requests to the port used by chutney verify -HiddenServicePort 5858 127.0.0.1:4747 +# This file is a backwards-compatibility redirect +# Older chutney networks use hs.tmpl for v2 onion services +${include:hs-v2.tmpl} diff --git a/torrc_templates/single-onion-common.i b/torrc_templates/single-onion-common.i new file mode 100644 index 0000000..eec4986 --- /dev/null +++ b/torrc_templates/single-onion-common.i @@ -0,0 +1,21 @@ +${include:hs-common.i} + +# Make this hidden service instance a Single Onion Service +HiddenServiceSingleHopMode 1 +HiddenServiceNonAnonymousMode 1 + +# Log only the messages we need to confirm that the Single Onion server is +# making one-hop circuits, and to see any errors or major issues +# To confirm one-hop intro and rendezvous circuits, look for +# rend_service_intro_has_opened and rend_service_rendezvous_has_opened, and +# check the length of the circuit in the next line. +Log notice [rend,bug]info file ${dir}/single-onion.log + +# Disable preemtive circuits, a Single Onion doesn't need them (except for +# descriptor posting). +# This stalls at bootstrap due to #17359. +#__DisablePredictedCircuits 1 +# A workaround is to set: +LongLivedPorts +# This disables everything except hidden service preemptive 3-hop circuits. +# See #17360. diff --git a/torrc_templates/single-onion-v2.tmpl b/torrc_templates/single-onion-v2.tmpl new file mode 100644 index 0000000..fb0b64e --- /dev/null +++ b/torrc_templates/single-onion-v2.tmpl @@ -0,0 +1,2 @@ +${include:single-onion-common.i} +HiddenServiceVersion 2 diff --git a/torrc_templates/single-onion-v3.tmpl b/torrc_templates/single-onion-v3.tmpl index 403e8fa..84a55d6 100644 --- a/torrc_templates/single-onion-v3.tmpl +++ b/torrc_templates/single-onion-v3.tmpl @@ -1,2 +1,2 @@ -${include:single-onion.tmpl} +${include:single-onion-common.i} HiddenServiceVersion 3 diff --git a/torrc_templates/single-onion.tmpl b/torrc_templates/single-onion.tmpl index 2b266c8..7fe7eb8 100644 --- a/torrc_templates/single-onion.tmpl +++ b/torrc_templates/single-onion.tmpl @@ -1,21 +1,3 @@ -${include:hs.tmpl} - -# Make every hidden service instance a Single Onion Service -HiddenServiceSingleHopMode 1 -HiddenServiceNonAnonymousMode 1 - -# Log only the messages we need to confirm that the Single Onion server is -# making one-hop circuits, and to see any errors or major issues -# To confirm one-hop intro and rendezvous circuits, look for -# rend_service_intro_has_opened and rend_service_rendezvous_has_opened, and -# check the length of the circuit in the next line. -Log notice [rend,bug]info file ${dir}/single-onion.log - -# Disable preemtive circuits, a Single Onion doesn't need them (except for -# descriptor posting). -# This stalls at bootstrap due to #17359. -#__DisablePredictedCircuits 1 -# A workaround is to set: -LongLivedPorts -# This disables everything except hidden service preemptive 3-hop circuits. -# See #17360. +# This file is a backwards-compatibility redirect +# Older chutney networks use single-onion.tmpl for v2 single onion services +${include:single-onion-v2.tmpl}

1 0

[tor/maint-0.3.4] mainloop: Set client role if ControlPort is set
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit b5731cdf2ecdf0662de7268d95aa67cfaca92b6e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 26 08:36:08 2018 -0400 mainloop: Set client role if ControlPort is set It turns out that if _only_ the ControlPort is set and nothing else, tor would simply not bootstrap and thus not start properly. Commit 67a41b63063370c2 removed that requirement for tor to be considered a "client". Unfortunately, this made the mainloop enable basically nothing if only the ControlPort is set in the torrc. This commit now makes it that we also consider the ControlPort when deciding if we are a Client or not. It does not revert 67a41b63063370c2 meaning options_any_client_port_set() stays the same, not looking at the control port. Fixes #27849. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27849 | 5 +++++ src/or/main.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/ticket27849 b/changes/ticket27849 new file mode 100644 index 000000000..c2babeffc --- /dev/null +++ b/changes/ticket27849 @@ -0,0 +1,5 @@ + o Major bugfixes (mainloop, bootstrap): + - Make sure Tor bootstraps and works properly if only the ControlPort is + set. Prior to this fix, Tor would only bootstrap with at least a client + port being set (Socks, Trans, NATD, DNS or HTTPTunnel port). Fixes bug + 27849; bugfix on 0.3.4.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index a93fdc392..bc01e07c3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1493,13 +1493,18 @@ get_my_roles(const or_options_t *options) int roles = 0; int is_bridge = options->BridgeRelay; - int is_client = options_any_client_port_set(options); int is_relay = server_mode(options); int is_dirauth = authdir_mode_v3(options); int is_bridgeauth = authdir_mode_bridge(options); int is_hidden_service = !!hs_service_get_num_services() || !!rend_num_services(); int is_dirserver = dir_server_mode(options); + /* We also consider tor to have the role of a client if the ControlPort is + * set because a lot of things can be done over the control port which + * requires tor to have basic functionnalities. */ + int is_client = options_any_client_port_set(options) || + options->ControlPort_set || + options->OwningControllerFD >= 0; if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;

1 0

[tor/release-0.3.4] mainloop: Set client role if ControlPort is set
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit b5731cdf2ecdf0662de7268d95aa67cfaca92b6e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 26 08:36:08 2018 -0400 mainloop: Set client role if ControlPort is set It turns out that if _only_ the ControlPort is set and nothing else, tor would simply not bootstrap and thus not start properly. Commit 67a41b63063370c2 removed that requirement for tor to be considered a "client". Unfortunately, this made the mainloop enable basically nothing if only the ControlPort is set in the torrc. This commit now makes it that we also consider the ControlPort when deciding if we are a Client or not. It does not revert 67a41b63063370c2 meaning options_any_client_port_set() stays the same, not looking at the control port. Fixes #27849. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27849 | 5 +++++ src/or/main.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/ticket27849 b/changes/ticket27849 new file mode 100644 index 000000000..c2babeffc --- /dev/null +++ b/changes/ticket27849 @@ -0,0 +1,5 @@ + o Major bugfixes (mainloop, bootstrap): + - Make sure Tor bootstraps and works properly if only the ControlPort is + set. Prior to this fix, Tor would only bootstrap with at least a client + port being set (Socks, Trans, NATD, DNS or HTTPTunnel port). Fixes bug + 27849; bugfix on 0.3.4.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index a93fdc392..bc01e07c3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1493,13 +1493,18 @@ get_my_roles(const or_options_t *options) int roles = 0; int is_bridge = options->BridgeRelay; - int is_client = options_any_client_port_set(options); int is_relay = server_mode(options); int is_dirauth = authdir_mode_v3(options); int is_bridgeauth = authdir_mode_bridge(options); int is_hidden_service = !!hs_service_get_num_services() || !!rend_num_services(); int is_dirserver = dir_server_mode(options); + /* We also consider tor to have the role of a client if the ControlPort is + * set because a lot of things can be done over the control port which + * requires tor to have basic functionnalities. */ + int is_client = options_any_client_port_set(options) || + options->ControlPort_set || + options->OwningControllerFD >= 0; if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit f8aad4a5486b3adb53d07eb74e912f9c92d63b00 Merge: bf1635d8c b5731cdf2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 18:05:58 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/ticket27849 | 5 +++++ src/or/main.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] Argh. The unset value for OwningControllerFD is NOT -1.
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit e97adaf8dc13a4f500fab3d70c9c31400a01954f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 16 17:57:00 2018 -0400 Argh. The unset value for OwningControllerFD is NOT -1. --- src/core/mainloop/mainloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 0f3fbbcce..a24b34375 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1503,7 +1503,7 @@ get_my_roles(const or_options_t *options) * requires tor to have basic functionnalities. */ int is_client = options_any_client_port_set(options) || options->ControlPort_set || - options->OwningControllerFD >= 0; + options->OwningControllerFD != UINT64_MAX; if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;

1 0

[tor/master] mainloop: Set client role if ControlPort is set
by nickm＠torproject.org 16 Oct '18

16 Oct '18

commit b5731cdf2ecdf0662de7268d95aa67cfaca92b6e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 26 08:36:08 2018 -0400 mainloop: Set client role if ControlPort is set It turns out that if _only_ the ControlPort is set and nothing else, tor would simply not bootstrap and thus not start properly. Commit 67a41b63063370c2 removed that requirement for tor to be considered a "client". Unfortunately, this made the mainloop enable basically nothing if only the ControlPort is set in the torrc. This commit now makes it that we also consider the ControlPort when deciding if we are a Client or not. It does not revert 67a41b63063370c2 meaning options_any_client_port_set() stays the same, not looking at the control port. Fixes #27849. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27849 | 5 +++++ src/or/main.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/ticket27849 b/changes/ticket27849 new file mode 100644 index 000000000..c2babeffc --- /dev/null +++ b/changes/ticket27849 @@ -0,0 +1,5 @@ + o Major bugfixes (mainloop, bootstrap): + - Make sure Tor bootstraps and works properly if only the ControlPort is + set. Prior to this fix, Tor would only bootstrap with at least a client + port being set (Socks, Trans, NATD, DNS or HTTPTunnel port). Fixes bug + 27849; bugfix on 0.3.4.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index a93fdc392..bc01e07c3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1493,13 +1493,18 @@ get_my_roles(const or_options_t *options) int roles = 0; int is_bridge = options->BridgeRelay; - int is_client = options_any_client_port_set(options); int is_relay = server_mode(options); int is_dirauth = authdir_mode_v3(options); int is_bridgeauth = authdir_mode_bridge(options); int is_hidden_service = !!hs_service_get_num_services() || !!rend_num_services(); int is_dirserver = dir_server_mode(options); + /* We also consider tor to have the role of a client if the ControlPort is + * set because a lot of things can be done over the control port which + * requires tor to have basic functionnalities. */ + int is_client = options_any_client_port_set(options) || + options->ControlPort_set || + options->OwningControllerFD >= 0; if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;

1 0