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

[tor/release-0.3.3] Make extend_info_from_node() more picky about node contents
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit d1874b433953f64b13a2feb0edc4bbff8940d503 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 09:56:12 2018 -0400 Make extend_info_from_node() more picky about node contents This update is needed to make it consistent with the behavior of node_awaiting_ipv6(), which doesn't believe in the addresses from routerinfos unless it actually plans to use those routerinfos. Fixes bug 25213; bugfix on b66b62fb7525cac1e1 in 0.3.3.1-alpha, which tightened up the definition of node_awaiting_ipv6(). --- changes/bug25213 | 5 +++++ src/or/circuitbuild.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/changes/bug25213 b/changes/bug25213 new file mode 100644 index 000000000..bb196ca72 --- /dev/null +++ b/changes/bug25213 @@ -0,0 +1,5 @@ + o Minor bugfixes (warnings, ipv6): + - Avoid a bug warning that could occur when trying to connect to + a relay over IPv6 on a Tor instance that downloads router descriptors, + but prefers to use microdescriptors. Fixes bug 25213; bugfix on + 0.3.3.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8fe6ba0e6..01921bac1 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2857,8 +2857,18 @@ extend_info_from_node(const node_t *node, int for_direct_connect) tor_addr_port_t ap; int valid_addr = 0; - if (node->ri == NULL && (node->rs == NULL || node->md == NULL)) - return NULL; + const int is_bridge = node_is_a_configured_bridge(node); + const int we_use_mds = we_use_microdescriptors_for_circuits(get_options()); + + if (is_bridge || !we_use_mds) { + /* We need an ri in this case. */ + if (!node->ri) + return NULL; + } else { + /* Otherwise we need an md. */ + if (node->rs == NULL || node->md == NULL) + return NULL; + } /* Choose a preferred address first, but fall back to an allowed address. * choose_address returns 1 on success, but get_prim_orport returns 0. */

1 0

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

27 Mar '18

commit d5580d9a2778ac399aa6db44ad602cf02e7c1dbe Merge: 1f3e0f157 46c2b0ca2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 07:05:15 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25213 | 5 +++++ src/or/circuitbuild.c | 14 ++++++++++++-- src/test/test_hs_service.c | 4 ++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug25213_033' into maint-0.3.3
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 46c2b0ca228d2d95666f28d4e42411dce0a59e15 Merge: 841ed9dbb 969a38a37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 07:04:33 2018 -0400 Merge branch 'bug25213_033' into maint-0.3.3 changes/bug25213 | 5 +++++ src/or/circuitbuild.c | 14 ++++++++++++-- src/test/test_hs_service.c | 4 ++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Fix a unit test which was broken by the previous commit
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 969a38a375f4e71fcb27bb24e36047824d0f3cc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 09:57:39 2018 -0400 Fix a unit test which was broken by the previous commit This test was expecting Tor to find and use routerinfos, but hadn't cleared the UseMicrodescriptors flag. Part of the fix for 25213. --- src/test/test_hs_service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index d62fcc8ca..2e5280610 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1237,6 +1237,10 @@ test_build_update_descriptors(void *arg) node->is_running = node->is_valid = node->is_fast = node->is_stable = 1; } + /* We have to set thise, or the lack of microdescriptors for these + * nodes will make them unusable. */ + get_options_mutable()->UseMicrodescriptors = 0; + /* We expect to pick only one intro point from the node above. */ setup_full_capture_of_logs(LOG_INFO); update_all_descriptors(now);

1 0

[tor/release-0.3.3] Merge branch 'bug25213_033' into maint-0.3.3
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 46c2b0ca228d2d95666f28d4e42411dce0a59e15 Merge: 841ed9dbb 969a38a37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 07:04:33 2018 -0400 Merge branch 'bug25213_033' into maint-0.3.3 changes/bug25213 | 5 +++++ src/or/circuitbuild.c | 14 ++++++++++++-- src/test/test_hs_service.c | 4 ++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[metrics-lib/master] Use timeout of one minute for fetching index.
by karsten＠torproject.org 27 Mar '18

27 Mar '18

commit 56c906f4a0d8ddbc3dd5cab08e3ea548384bbd10 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Mar 19 10:58:38 2018 +0000 Use timeout of one minute for fetching index. This is set for connect as well as read and can be overridden by system properties sun.net.client.default<Connect|Read>Timeout. Implements task-24290. --- .../java/org/torproject/descriptor/index/IndexNode.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 4c4c884..19a5aa4 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -19,6 +19,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.Reader; import java.net.URL; +import java.net.URLConnection; import java.nio.file.Files; import java.nio.file.Path; import java.util.SortedMap; @@ -37,6 +38,12 @@ public class IndexNode { private static Logger log = LoggerFactory.getLogger(IndexNode.class); + private static final int READ_TIMEOUT = Integer.parseInt(System + .getProperty("sun.net.client.defaultReadTimeout", "60000")); + + private static final int CONNECT_TIMEOUT = Integer.parseInt(System + .getProperty("sun.net.client.defaultConnectTimeout", "60000")); + /** An empty node, which is not added to JSON output. */ public static final IndexNode emptyNode = new IndexNode("", "", new TreeSet<FileNode>(), new TreeSet<DirectoryNode>()); @@ -97,8 +104,12 @@ public class IndexNode { public static IndexNode fetchIndex(String urlString) throws Exception { String ending = urlString.substring(urlString.lastIndexOf(".") + 1).toUpperCase(); + URLConnection connection = (new URL(urlString)).openConnection(); + connection.setReadTimeout(READ_TIMEOUT); + connection.setConnectTimeout(CONNECT_TIMEOUT); + connection.connect(); try (InputStream is = FileType.valueOf(ending) - .inputStream(new URL(urlString).openStream())) { + .inputStream(connection.getInputStream())) { return fetchIndex(is); } }

1 0

[metrics-lib/master] Add change log entry for #24290.
by karsten＠torproject.org 27 Mar '18

27 Mar '18

commit f826234e8064014487d871838e8074e83a142e42 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 27 09:25:35 2018 +0200 Add change log entry for #24290. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8576e3..58235e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes. - Override logLines() method from LogDescriptor in WebServerAccessLog. + - Use 1-minute connect and read timeouts for fetching CollecTor's + index.json. # Changes in version 2.2.0 - 2018-02-26

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Revert "Orfox: Fix #1 - Improve build instructions"
by gk＠torproject.org 27 Mar '18

27 Mar '18

commit cc4c7e19e9474e423aebbc00be898824f27d496a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 27 06:25:17 2018 +0000 Revert "Orfox: Fix #1 - Improve build instructions" This reverts commit c981d290167b8547789849194ed12dd763f1f892. --- README.md | 20 -------------------- README.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md deleted file mode 100644 index 8cf5ca26625a..000000000000 --- a/README.md +++ /dev/null @@ -1,20 +0,0 @@ -## ORFOX BUILD STEPS: - -1) Move .mozconfig-android to .mozconfig OR run: -``` -export MOZCONFIG="tor-browser/.mozconfig-android" -``` -2) Checks if the all requirements for the build are fine with: -``` -./mach configure -``` -3) Builds the repo with: -``` -./mach build -``` -4) Creates the apk in tor-browser/MOZ_OBJDIR/dist/fennec-38.0.en-US.android-arm.apk -``` -./mach package -``` -### Note: this does not ship the addons, that is managed in a different repo: https://github.com/amoghbl1/orfox-addons. -### Steps to include these addons can be figured out looking at the jenkins script at https://github.com/amoghbl1/Orfox/blob/master/jenkins-build diff --git a/README.txt b/README.txt new file mode 100644 index 000000000000..658c0dce3174 --- /dev/null +++ b/README.txt @@ -0,0 +1,27 @@ +An explanation of the Mozilla Source Code Directory Structure and links to +project pages with documentation can be found at: + + https://developer.mozilla.org/en/Mozilla_Source_Code_Directory_Structure + +For information on how to build Mozilla from the source code, see: + + http://developer.mozilla.org/en/docs/Build_Documentation + +To have your bug fix / feature added to Mozilla, you should create a patch and +submit it to Bugzilla (https://bugzilla.mozilla.org) Instructions are at: + + http://developer.mozilla.org/en/docs/Creating_a_patch + http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree + +If you have a question about developing Mozilla, and can't find the solution +on http://developer.mozilla.org, you can try asking your question in a +mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups +are accessible on Google Groups, or news.mozilla.org with a NNTP reader.] + +You can download nightly development builds from the Mozilla FTP server. +Keep in mind that nightly builds, which are used by Mozilla developers for +testing, may be buggy. Firefox nightlies, for example, can be found at: + + https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/ + - or - + http://nightly.mozilla.org/

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 27 Mar '18

27 Mar '18

commit c6e5ed78f359853035d9161be596db05edc8c907 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 00:19:54 2018 +0000 Update translations for tails-greeter-2_completed --- ru/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/ru.po b/ru/ru.po index b87ab6c49..b18cf06a3 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yanis Voloshin <y(a)7i4.ru>, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"

1 0

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

27 Mar '18

commit df0783bbdae477359ed8c77b74c47a99b69f7602 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 00:19:49 2018 +0000 Update translations for tails-greeter-2 --- ru/ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/ru.po b/ru/ru.po index b87ab6c49..b18cf06a3 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yanis Voloshin <y(a)7i4.ru>, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"

1 0