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

[tor/master] Merge remote-tracking branch 'arma/bug22212'
by nickm＠torproject.org 06 Feb '18

06 Feb '18

commit 87db5a6b758db2e0a69c34acfc2481a91018d9aa Merge: b5a8fd156 3d9dcb49e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 6 11:36:13 2018 -0500 Merge remote-tracking branch 'arma/bug22212' changes/bug22212-forreal | 8 ++++++++ src/or/connection_or.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --cc src/or/connection_or.c index 8379f5803,85459b62e..455bb66cb --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@@ -592,6 -591,13 +592,10 @@@ connection_or_flushed_some(or_connectio { size_t datalen; + /* Update the channel's active timestamp if there is one */ + if (conn->chan) + channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan)); + - /* The channel will want to update its estimated queue size */ - channel_update_xmit_queue_size(TLS_CHAN_TO_BASE(conn->chan)); - /* If we're under the low water mark, add cells until we're just over the * high water mark. */ datalen = connection_get_outbuf_len(TO_CONN(conn));

1 0

[tor/master] Merge branch 'arma_bug22212_031'
by nickm＠torproject.org 06 Feb '18

06 Feb '18

commit a384937f848dc2e7b45c4b4be49467eac2a2db19 Merge: 87db5a6b7 5a1e0bfcd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 6 11:41:52 2018 -0500 Merge branch 'arma_bug22212_031' changes/bug22212-forreal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Add a category for the 22212-forreal changes file
by nickm＠torproject.org 06 Feb '18

06 Feb '18

commit 5a1e0bfcdc8f4c357a832a9f1c39b69afd188b4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 6 11:41:31 2018 -0500 Add a category for the 22212-forreal changes file --- changes/bug22212-forreal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug22212-forreal b/changes/bug22212-forreal index 3b7e3ca0e..159d0990e 100644 --- a/changes/bug22212-forreal +++ b/changes/bug22212-forreal @@ -1,4 +1,4 @@ - o Major bugfixes: + o Major bugfixes (netflow padding): - Stop adding unneeded channel padding right after we finish flushing to a connection that has been trying to flush for many seconds. Instead, treat all partial or complete flushes as activity on the

1 0

[metrics-web/master] Sleep rather than wait.
by karsten＠torproject.org 06 Feb '18

06 Feb '18

commit fd132b88376476b2cc844aa4b6ee4aecfbf616ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 8 11:29:14 2018 +0100 Sleep rather than wait. Fixes #24824. --- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index ecf716c..2960599 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -40,11 +40,11 @@ public class CollectorDirectoryProvider implements Runnable { long waitingSinceMillis = System.currentTimeMillis(); do { try { - this.wait(200L); + Thread.sleep(200L); } catch (InterruptedException e) { /* Ignore. */ } - } while (null == index.get() + } while (null == this.index.get() && System.currentTimeMillis() < waitingSinceMillis + 10000L); } return this.index.get();

1 0

[metrics-lib/master] Add log message reporting progress reading tarballs.
by karsten＠torproject.org 06 Feb '18

06 Feb '18

commit 9f2db9a194d5e290b456765f83cc6eeaf745e619 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Dec 3 21:11:07 2017 +0100 Add log message reporting progress reading tarballs. Implements #22990. --- CHANGELOG.md | 3 ++ .../descriptor/impl/DescriptorReaderImpl.java | 37 +++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5939e38..91f00b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - Add new descriptor type WebServerAccessLog to parse web server access logs. + * Minor changes + - Add log message reporting progress reading tarballs. + # Changes in version 2.1.1 - 2017-10-09 diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 4da474e..a8a7790 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -23,6 +23,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -34,6 +35,9 @@ public class DescriptorReaderImpl implements DescriptorReader { private static Logger log = LoggerFactory.getLogger( DescriptorReaderImpl.class); + + private static Logger statisticsLog = LoggerFactory.getLogger("statistics"); + private boolean hasStartedReading = false; private File manualSaveHistoryFile; @@ -125,6 +129,8 @@ public class DescriptorReaderImpl implements DescriptorReader { private File manualSaveHistoryFile; + private List<File> tarballs = new ArrayList<>(); + private SortedMap<String, Long> excludedFilesBefore = new TreeMap<>(); private SortedMap<String, Long> excludedFilesAfter = new TreeMap<>(); @@ -153,6 +159,7 @@ public class DescriptorReaderImpl implements DescriptorReader { this.readOldHistory(this.autoSaveHistoryFile); this.readOldHistory(this.manualSaveHistoryFile); this.readDescriptorFiles(); + this.readTarballs(); this.hasFinishedReading = true; } catch (Throwable t) { log.error("Bug: uncaught exception or error while " @@ -242,7 +249,8 @@ public class DescriptorReaderImpl implements DescriptorReader { } else if (file.getName().endsWith(".tar") || file.getName().endsWith(".tar.bz2") || file.getName().endsWith(".tar.xz")) { - this.readTarball(file); + tarballs.add(file); + continue; } else { this.readDescriptorFile(file); } @@ -254,6 +262,33 @@ public class DescriptorReaderImpl implements DescriptorReader { } } + private void readTarballs() { + if (this.tarballs.isEmpty()) { + return; + } + long total = 0L; + for (File tarball : this.tarballs) { + total += tarball.length(); + } + long progress = 0L; + for (File tarball : this.tarballs) { + try { + this.readTarball(tarball); + this.parsedFilesAfter.put(tarball.getAbsolutePath(), + tarball.lastModified()); + } catch (IOException e) { + log.warn("Unable to read tarball {}.", tarball, e); + } + long previousPercentDone = 100L * progress / total; + progress += tarball.length(); + long percentDone = 100L * progress / total; + if (percentDone > previousPercentDone) { + statisticsLog.info("Finished reading {}% of tarball bytes.", + percentDone); + } + } + } + private void readTarball(File file) throws IOException { FileInputStream in = new FileInputStream(file); if (in.available() <= 0) {

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Feb '18

06 Feb '18

commit 9f854035220f4fbbffb8ee20147618e77bc0c78a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 6 12:50:54 2018 +0000 Update translations for tor-browser-manual --- uk/uk.po | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/uk/uk.po b/uk/uk.po index 15bff880e..ae192dd92 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -6,12 +6,13 @@ # Serge Thirdlingson <serge3ling(a)gmail.com>, 2017 # Vira Motorko <ato4ka(a)i.ua>, 2017 # Любомир <n.lyubomyr(a)gmail.com>, 2017 +# O Herenko <herenko(a)ex.ua>, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Любомир <n.lyubomyr(a)gmail.com>, 2017\n" +"Last-Translator: O Herenko <herenko(a)ex.ua>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -957,29 +958,35 @@ msgstr "" #: onionsites.page:6 msgid "Services that are only accessible using Tor" -msgstr "" +msgstr "Послуги, доступні лише для використання Tor" #: onionsites.page:10 msgid "Onion Services" -msgstr "" +msgstr "Послуги Onion" #: onionsites.page:11 msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Послуги Onion (раніше відомі як \"приховані служби\") — це послуги (як-от " +"веб-сайти), доступні лише через мережу Tor." #: onionsites.page:16 msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" +"Послуги Onion пропонують кілька переваг перед звичайними послугами в не " +"приватній мережі:" #: onionsites.page:23 msgid "" "An onion services’s location and IP address are hidden, making it difficult " "for adversaries to censor it or identify its operators." msgstr "" +"Місцезнаходження та IP-адреси послуг Onion приховані, що ускладнює " +"противникам цензурування або ідентифікацію їх користувача." #: onionsites.page:29 msgid "" @@ -987,6 +994,9 @@ msgid "" " you do not need to worry about <link xref=\"secure-connections\">connecting" " over HTTPS</link>." msgstr "" +"Весь трафік між користувачами Tor і службами onion цілком зашифрований, так " +"що вам не потрібно турбуватися про <link xref=\"secure-" +"connections\">підключення через HTTPS</link>." #: onionsites.page:36 msgid ""

1 0

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

06 Feb '18

commit 0f186e85c95c61cbbad9d4048963ba02d1639e82 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 6 12:17:01 2018 +0000 Update translations for tor-launcher-network-settings --- uk/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd index 37794528f..16940b34f 100644 --- a/uk/network-settings.dtd +++ b/uk/network-settings.dtd @@ -48,7 +48,7 @@ <!ENTITY torsettings.copyLog "Скопіювати журнал Tor до буферу обміну"> <!ENTITY torsettings.proxyHelpTitle "Довідка Проксі"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "Локальний проксі-сервер потрібен під час підключення через мережу компанії, школи або університету. Якщо ви не знаєте, як відповісти на це запитання, перегляньте налаштування Інтернету в іншому веб-переглядачі або перевірте ваші мережеві налаштування системи, щоб дізнатися, чи потрібен проксі-сервер."> <!ENTITY torsettings.bridgeHelpTitle "Допомога по ретрансляторам типу міст"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 06 Feb '18

06 Feb '18

commit 9e9944cb8611aaf325424bcf4618e743e9519502 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 6 12:16:27 2018 +0000 Update translations for torbirdy_completed --- uk/torbirdy.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd index 8ee0441bb..b9e361997 100644 --- a/uk/torbirdy.dtd +++ b/uk/torbirdy.dtd @@ -38,6 +38,8 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не вставляти ідентифікатори ключів у зашифровані повідомлення [за замовчуванням: вставляти]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Вимкнути зашифровані заголовки електронної пошти [за замовчуванням: увімкнено]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Підтверджувати перед відправкою листа, якщо Enigmail активний [за замовчуванням: не підтверджувати]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Активувати автоматичний майстер налаштування пошти Thunderbird [за замовчуванням: неактивований]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 06 Feb '18

06 Feb '18

commit 93cebaa109cdc8657d75eae49eddb7d1ec8bae7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 6 12:16:16 2018 +0000 Update translations for torbirdy --- uk/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd index ddafa7b32..b9e361997 100644 --- a/uk/torbirdy.dtd +++ b/uk/torbirdy.dtd @@ -38,7 +38,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не вставляти ідентифікатори ключів у зашифровані повідомлення [за замовчуванням: вставляти]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Вимкнути зашифровані заголовки електронної пошти [за замовчуванням: увімкнено]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Підтверджувати перед відправкою листа, якщо Enigmail активний [за замовчуванням: не підтверджувати]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[webwml/master] Update gitignore to avoid editor drops
by hiro＠torproject.org 06 Feb '18

06 Feb '18

commit ecfeb321af2e2c535b3ca56b03186ea96c06f8b7 Author: hiromipaw <hiro(a)torproject.org> Date: Tue Feb 6 11:09:06 2018 +0100 Update gitignore to avoid editor drops --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5c557e58..d8022fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,8 @@ .deps *.html.en *.html.es -*~.* +\#*\# +.#* +*~ +*.swp +*.swo

1 0