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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 27 Mar '18

27 Mar '18

commit 634887c11cb09c81725d65a55cd284e2a80173a1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 14:46:17 2018 +0000 Update translations for tor-launcher-properties --- tr/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index 1586384a6..cf44e7e86 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.bridge_suffix.meek-azure=(Çin'de çalışır) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.contacting_bridgedb=Köprü veritabanına bağlanılıyor. Lütfen bekleyin. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. torlauncher.bad_captcha_solution=The solution is not correct. Please try again. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sunucu yöneltmesi yok torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir aktarım bulunamadı -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. +torlauncher.nsresult.NS_ERROR_NET_RESET=Sunucuyla bağlantı kesildi torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.

1 0

[metrics-web/master] Update news.json to version 246 of doc/MetricsTimeline.
by karsten＠torproject.org 27 Mar '18

27 Mar '18

commit e11c2962bf241f52023866373d597add77fd5882 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 26 11:48:36 2018 +0200 Update news.json to version 246 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 167 +++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 8e103d7..2f72791 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -2826,6 +2826,21 @@ ] }, { + "start": "2016-11-16", + "shortDescription": "Tor Browser 6.5a4 is released", + "description": "Tor Browser 6.5a4 is released. It changes the <code>app.update.url</code>.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-65a4-released" + }, + { + "label": "ticket", + "target": "https://bugs.torproject.org/19481" + } + ] + }, + { "start": "2016-11-18", "protocols": [ "obfs4" @@ -2937,6 +2952,20 @@ ] }, { + "start": "2016-12-13", + "protocols": [ + "obfs4" + ], + "shortDescription": "Tor Browser 6.5a6 is released", + "description": "Tor Browser 6.5a6 is released. It fixes the <code>app.update.url</code>. It adds (uncomments) the default obfs4 bridge NX01:443. It activates timing obfuscation for certain obfs4 bridges. It changes the port of other obfs4 bridges.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-65a6-released" + } + ] + }, + { "start": "2016-12-15", "ongoing": true, "places": [ @@ -3011,6 +3040,44 @@ ] }, { + "start": "2017-01-24", + "shortDescription": "Tor Browser 6.5 is released", + "description": "Tor Browser 6.5 is released. It changes the <code>app.update.url</code>, which causes an apparent drop in update pings.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-65-released" + }, + { + "label": "graph", + "target": "https://metrics.torproject.org/webstats-tb.html?start=2017-01-01&end=2017-0…" + }, + { + "label": "ticket", + "target": "https://bugs.torproject.org/19481" + }, + { + "label": "comment about app.update.url", + "target": "https://bugs.torproject.org/22346#comment:1" + } + ] + }, + { + "start": "2017-01-25", + "end": "2017-04-05", + "protocols": [ + "webstats" + ], + "shortDescription": "Tor Browser update pings roughly halve", + "description": "Tor Browser update pings roughly halve. The beginning corresponds with the release of Tor Browser 6.5.2, which changed the <code>app.update.url</code>. The end doesn't correspond to any release.", + "links": [ + { + "label": "ticket", + "target": "https://bugs.torproject.org/22346" + } + ] + }, + { "start": "2017-02-10", "ongoing": true, "protocols": [ @@ -3182,6 +3249,41 @@ ] }, { + "start": "2017-04-19", + "protocols": [ + "meek", + "obfs4" + ], + "shortDescription": "Tor Browser 6.5.2 is released", + "description": "Tor Browser 6.5.2 is released. It changes the <code>app.update.url</code>. It changes the meek-amazon backend. It adds the new default obfs4 bridges cymrubridge31:80 and cymrubridge33:80.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-652-released" + }, + { + "label": "comment about app.update.url", + "target": "https://bugs.torproject.org/22346#comment:1" + } + ] + }, + { + "start": "2017-04-20", + "protocols": [ + "meek", + "obfs4", + "scramblesuit" + ], + "shortDescription": "Tor Browser 7.0a3 is released", + "description": "Tor Browser 7.0a3 is released. It changes the <code>app.update.url</code>. It removes the last remaining scramblesuit bridge. It changes the meek-amazon backend. It adds the new default obfs4 bridges cymrubridge31:80 and cymrubridge33:80.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-70a3-released" + } + ] + }, + { "start": "2017-04-30", "protocols": [ "meek" @@ -4090,14 +4192,18 @@ }, { "start": "2017-12-28", - "ongoing": true, + "end": "2018-01-13", "places": [ "ir" ], - "shortDescription": "Protests in Iran, blocking of various services including Tor.", - "description": "Protests in Iran, blocking of various services including Tor.", + "shortDescription": "Protests in Iran, blocking of various services including Tor", + "description": "Protests in Iran, blocking of various services including Tor. Instagram was unblocked 2018-01-06. Telegram was unblocked 2018-01-13.", "links": [ { + "label": "Wikipedia", + "target": "https://en.wikipedia.org/wiki/2017%E2%80%932018_Iranian_protests#Media_cove…" + }, + { "label": "OONI report", "target": "https://ooni.torproject.org/post/2018-iran-protests/" }, @@ -4185,6 +4291,39 @@ ] }, { + "start": "2018-01-23", + "protocols": [ + "obfs4" + ], + "shortDescription": "Tor Browser 7.5 is released", + "description": "Tor Browser 7.5 is released. It adds the default obfs4 bridge noisetor01:46089.", + "links": [ + { + "label": "blog post", + "target": "https://blog.torproject.org/tor-browser-75-released" + } + ] + }, + { + "start": "2018-01-24", + "ongoing": true, + "protocols": [ + "webstats" + ], + "shortDescription": "Tor Browser update pings roughly halve, again", + "description": "Tor Browser update pings roughly halve, again. The beginning corresponds with the release of Tor Browser 7.5; however unlike with Tor Browser 6.5.2, there was no change to <code>app.update.url</code> this time.", + "links": [ + { + "label": "ticket", + "target": "https://bugs.torproject.org/22346" + }, + { + "label": "thread", + "target": "https://lists.torproject.org/pipermail/metrics-team/2018-March/000750.html" + } + ] + }, + { "start": "2018-02-08", "protocols": [ "ipv4", @@ -4354,6 +4493,28 @@ ] }, { + "start": "2018-03-22", + "protocols": [ + "snowflake" + ], + "shortDescription": "Provisonally increased memory limits of the fallback snowflake proxies to 400 MB, 800 MB, or unlimited.", + "description": "Provisonally increased memory limits of the fallback snowflake proxies to 400 MB, 800 MB, or unlimited." + }, + { + "start": "2018-03-23", + "protocols": [ + "snowflake" + ], + "shortDescription": "Restarted the fallback snowflake proxies with a limit on resident memory", + "description": "Restarted the fallback snowflake proxies with a limit on resident memory (<code>ulimit -m</code>) rather than virtual memory (<code>ulimit -v</code>).", + "links": [ + { + "label": "comment", + "target": "https://bugs.torproject.org/21312#comment:64" + } + ] + }, + { "start": "2016-02-24", "places": [ "tm"

1 0

[onionoo/master] Only unescape valid UTF.
by karsten＠torproject.org 27 Mar '18

27 Mar '18

commit 532ef3479a576733934edb45f588f2a074061f62 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Mar 15 13:58:17 2018 +0000 Only unescape valid UTF. Add a utility method for only un-escaping valid utf and supply a test as well as test data for this issue. Fixes task-22594. --- CHANGELOG.md | 8 ++++ .../org/torproject/onionoo/docs/DocumentStore.java | 4 +- .../torproject/onionoo/server/ResponseBuilder.java | 5 +-- .../torproject/onionoo/util/FormattingUtils.java | 34 +++++++++++++++++ .../onionoo/util/FormattingUtilsTest.java | 43 ++++++++++++++++++++++ src/test/resources/lines-for-escape-tests.txt | 16 ++++++++ 6 files changed, 104 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe389b..3a3c468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 5.1-1.12.0 - 2018-??-?? + + * Minor changes + - Don't attempt to un-escape character sequences in contact lines + (like "\uk") that only happen to start like escaped utf-8 characters + (like "\u0055"). + + # Changes in version 5.1-1.11.0 - 2018-03-14 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 4622a34..f1f3803 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -9,7 +9,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -318,8 +317,7 @@ public class DocumentStore { * objects are escaped JSON, e.g., \u00F2. When Gson serlializes * this string, it escapes the \ to \\, hence writes \\u00F2. We * need to undo this and change \\u00F2 back to \u00F2. */ - documentString = StringUtils.replace(gson.toJson(document), - "\\\\u", "\\u"); + documentString = FormattingUtils.replaceValidUtf(gson.toJson(document)); /* Existing details statuses don't contain opening and closing curly * brackets, so we should remove them from new details statuses, * too. */ diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index bb36a2c..e2bdf82 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -12,12 +12,11 @@ import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.SummaryDocument; import org.torproject.onionoo.docs.UptimeDocument; import org.torproject.onionoo.docs.WeightsDocument; +import org.torproject.onionoo.util.FormattingUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.commons.lang3.StringUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -348,7 +347,7 @@ public class ResponseBuilder { /* Whenever we provide Gson with a string containing an escaped * non-ASCII character like \u00F2, it escapes the \ to \\, which * we need to undo before including the string in a response. */ - return StringUtils.replace(gson.toJson(dd), "\\\\u", "\\u"); + return FormattingUtils.replaceValidUtf(gson.toJson(dd)); } else { // TODO We should probably log that we didn't find a details // document that we expected to exist. diff --git a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java index 7ed1377..3d16f5a 100644 --- a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java +++ b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java @@ -3,8 +3,18 @@ package org.torproject.onionoo.util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** Static helper methods for string processing etc. */ public class FormattingUtils { + private static Logger log = LoggerFactory.getLogger( + FormattingUtils.class); + private FormattingUtils() { } @@ -35,5 +45,29 @@ public class FormattingUtils { public static String formatDecimalNumber(long decimalNumber) { return String.format("%,d", decimalNumber); } + + private static Pattern escapePattern = Pattern.compile( + "(\\\\{4}u[0-9a-fA-F]{4})"); + + /** De-escape only valid UTF and leave anything else escaped. */ + public static String replaceValidUtf(String text) { + if (null == text || text.isEmpty()) { + return text; + } + try { + StringBuffer sb = new StringBuffer(); + Matcher mat = escapePattern.matcher(text); + while (mat.find()) { + String unescaped = mat.group(1); + mat.appendReplacement(sb, unescaped); + } + mat.appendTail(sb); + return sb.toString(); + } catch (Throwable ex) { + log.debug("Couldn't process input '{}'.", text, ex); + return text; + } + } + } diff --git a/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java new file mode 100644 index 0000000..8744696 --- /dev/null +++ b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java @@ -0,0 +1,43 @@ +package org.torproject.onionoo.util; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +import java.io.File; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +(a)RunWith(Parameterized.class) +public class FormattingUtilsTest { + + /** Provide test data. */ + @Parameters + public static Collection<String[]> data() throws Exception { + List<String> lines = Files.readAllLines((new File(ClassLoader + .getSystemResource("lines-for-escape-tests.txt").toURI())) + .toPath()); + List<String[]> testData = new ArrayList<>(); + for (int i = 0; i < lines.size(); i += 2) { + testData.add(new String[]{lines.get(i), lines.get(i + 1)}); + } + return testData; + } + + @Parameter(0) + public String in; + + @Parameter(1) + public String out; + + @Test + public void testReplaceUtf() { + assertEquals(out, new String(FormattingUtils.replaceValidUtf(in))); + } +} diff --git a/src/test/resources/lines-for-escape-tests.txt b/src/test/resources/lines-for-escape-tests.txt new file mode 100644 index 0000000..4fb5895 --- /dev/null +++ b/src/test/resources/lines-for-escape-tests.txt @@ -0,0 +1,16 @@ + + +abc +abc +\\\\u +\\\\u +Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk +Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk +\\\\u20ac +\\u20ac +\\\\u0024 +\\u0024 +some \\\\u20ac other string \\\\u0024 to unescape +some \\u20ac other string \\u0024 to unescape +abcd efg\\\\u0024xyz\\\\uxxxx +abcd efg\\u0024xyz\\\\uxxxx

1 0

[tor/maint-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/maint-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/maint-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

[tor/master] 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/master] 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/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 979c7e5c83531089aa4bf3998ae3353fbdd2031d Merge: 0eed0899c 46c2b0ca2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 07:05:15 2018 -0400 Merge branch '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] 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