[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

[translation]

commit 5f8a3f9436b0f15b845b806e451ea02158221eea
Author: Translation commit bot 
Date:   Fri Oct 27 04:50:22 2017 +

Update translations for tails-greeter-2
---
 ar/ar.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 15065e517..9fd5ee777 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Yassmin Alkhatib , 2016\n"
+"Last-Translator: mohammad ali , 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:6
 msgid "Disable"
-msgstr ""
+msgstr "إلغاء"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: ../data/greeter.ui.h:8

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

[translation]

commit 6686c3826e886e91de40ca11218f6cd367f4b83c
Author: Translation commit bot 
Date:   Fri Oct 27 04:45:14 2017 +

Update translations for bridgedb_completed
---
 ar/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 5d01f49c3..da0f611bd 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-23 18:03+\n"
+"PO-Revision-Date: 2017-10-27 04:27+\n"
 "Last-Translator: Abderrahman Ait Ali \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[translation]

commit da51a495f6c6bf9e4a71b8ab3b6ae7bcc56043af
Author: Translation commit bot 
Date:   Fri Oct 27 04:45:06 2017 +

Update translations for bridgedb
---
 ar/LC_MESSAGES/bridgedb.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 5d01f49c3..da0f611bd 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-09-23 18:03+\n"
+"PO-Revision-Date: 2017-10-27 04:27+\n"
 "Last-Translator: Abderrahman Ait Ali \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

[translation]

commit 137286f876b5388b83c2eda5dbcea6185049ada7
Author: Translation commit bot 
Date:   Thu Oct 26 22:51:27 2017 +

Update translations for tails-greeter-2
---
 ru@petr1708/r...@petr1708.po | 2 +-
 sr@latin/s...@latin.po   | 2 +-
 ug@Arab/u...@arab.po | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ru@petr1708/r...@petr1708.po b/ru@petr1708/r...@petr1708.po
index b0242467b..88dc956e1 100644
--- a/ru@petr1708/r...@petr1708.po
+++ b/ru@petr1708/r...@petr1708.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alvina alexandrova , 2016\n"
-"Language-Team: Russian Petrine orthography 
(https://www.transifex.com/otf/teams/1519/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography 
(https://www.transifex.com/otf/teams/1519/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sr@latin/s...@latin.po b/sr@latin/s...@latin.po
index d99a96aac..727ebad9a 100644
--- a/sr@latin/s...@latin.po
+++ b/sr@latin/s...@latin.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Milenko Doder , 2016\n"
-"Language-Team: Serbian (Latin) 
(https://www.transifex.com/otf/teams/1519/sr@latin/)\n"
+"Language-Team: Serbian (Latin) 
(https://www.transifex.com/otf/teams/1519/sr%40latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ug@Arab/u...@arab.po b/ug@Arab/u...@arab.po
index 1801ea5b7..5ed3e4fe9 100644
--- a/ug@Arab/u...@arab.po
+++ b/ug@Arab/u...@arab.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: crash x , 2016\n"
-"Language-Team: Uighur (Arabic) 
(https://www.transifex.com/otf/teams/1519/ug@Arab/)\n"
+"Language-Team: Uighur (Arabic) 
(https://www.transifex.com/otf/teams/1519/ug%40Arab/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit dddac47e230adcbe529568668f3ed046eb23d569
Author: Translation commit bot 
Date:   Thu Oct 26 21:52:20 2017 +

Update translations for tor-browser-manual
---
 ru@petr1708/r...@petr1708.po | 2 +-
 sr@latin/s...@latin.po   | 2 +-
 ug@Arab/u...@arab.po | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ru@petr1708/r...@petr1708.po b/ru@petr1708/r...@petr1708.po
index fcfde..d298044bb 100644
--- a/ru@petr1708/r...@petr1708.po
+++ b/ru@petr1708/r...@petr1708.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alvina alexandrova , 2016\n"
-"Language-Team: Russian Petrine orthography 
(https://www.transifex.com/otf/teams/1519/ru@petr1708/)\n"
+"Language-Team: Russian Petrine orthography 
(https://www.transifex.com/otf/teams/1519/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sr@latin/s...@latin.po b/sr@latin/s...@latin.po
index 52b786ee1..b35700bc6 100644
--- a/sr@latin/s...@latin.po
+++ b/sr@latin/s...@latin.po
@@ -6,7 +6,7 @@ msgstr ""
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: JanaDi , 2016\n"
-"Language-Team: Serbian (Latin) 
(https://www.transifex.com/otf/teams/1519/sr@latin/)\n"
+"Language-Team: Serbian (Latin) 
(https://www.transifex.com/otf/teams/1519/sr%40latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ug@Arab/u...@arab.po b/ug@Arab/u...@arab.po
index 75e0baaff..fbce8bc0e 100644
--- a/ug@Arab/u...@arab.po
+++ b/ug@Arab/u...@arab.po
@@ -6,7 +6,7 @@ msgstr ""
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: crash x , 2016\n"
-"Language-Team: Uighur (Arabic) 
(https://www.transifex.com/otf/teams/1519/ug@Arab/)\n"
+"Language-Team: Uighur (Arabic) 
(https://www.transifex.com/otf/teams/1519/ug%40Arab/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Handle descriptors without an uptime line.

[karsten]

commit 3e6bff476d11acfe1a5d102f748b1e22109199a0
Author: Karsten Loesing 
Date:   Thu Oct 26 22:03:02 2017 +0200

Handle descriptors without an uptime line.
---
 .../torproject/ernie/cron/RelayDescriptorDatabaseImporter.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
 
b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
index 856d2f7..026707b 100644
--- 
a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
+++ 
b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
@@ -25,6 +25,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -402,7 +403,7 @@ public final class RelayDescriptorDatabaseImporter {
   String nickname, String address, int orPort, int dirPort,
   String relayIdentifier, long bandwidthAvg, long bandwidthBurst,
   long bandwidthObserved, String platform, long published,
-  long uptime, String extraInfoDigest) {
+  Long uptime, String extraInfoDigest) {
 if (this.importIntoDatabase) {
   try {
 this.addDateToScheduledUpdates(published);
@@ -430,7 +431,11 @@ public final class RelayDescriptorDatabaseImporter {
   this.psD.setString(10, new String(platform.getBytes(),
   StandardCharsets.US_ASCII).replaceAll("[^\\p{ASCII}]",""));
   this.psD.setTimestamp(11, new Timestamp(published), cal);
-  this.psD.setLong(12, uptime);
+  if (null != uptime) {
+this.psD.setLong(12, uptime);
+  } else {
+this.psD.setNull(12, Types.BIGINT);
+  }
   this.psD.setString(13, extraInfoDigest);
   this.psD.executeUpdate();
   rdsCount++;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/release] Prepare for 4.2-1.6.1 release.

[karsten]

commit 8946c7ea9eb81edfc32a5ef3f5f9a11c9d552733
Author: Karsten Loesing 
Date:   Thu Oct 26 20:50:30 2017 +0200

Prepare for 4.2-1.6.1 release.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 5f072bb..25477df 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.6.1"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/release] Fix two NullPointerExceptions.

[karsten]

commit 563f762ca7eeb649ac3d8777f5924d9c66cfd760
Author: Karsten Loesing 
Date:   Thu Oct 26 10:28:11 2017 +0200

Fix two NullPointerExceptions.

There's a relay running an alternate Tor version that produces
descriptors without "uptime" line, and the directory authorities don't
include a "v" line for that relay, likely because its platform string
does not include the magic word "Tor".

Fixes #24012.
---
 CHANGELOG.md|  8 
 .../java/org/torproject/onionoo/docs/DetailsStatus.java |  3 ++-
 .../java/org/torproject/onionoo/docs/NodeStatus.java|  3 ++-
 .../onionoo/updater/NodeDetailsStatusUpdater.java   | 17 +++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2aff31..ca17fa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Changes in version 4.2-1.6.1 - 2017-10-2?
+
+ * Medium changes
+   - Fix two NullPointerExceptions caused by accessing optional parts
+ of relay server descriptors and consensuses without checking
+ first whether they're available or not.
+
+
 # Changes in version 4.2-1.6.0 - 2017-10-09
 
  * Medium changes
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
index 0a0c215..faec117 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
@@ -45,7 +45,8 @@ public class DetailsStatus extends Document {
   private String last_restarted;
 
   public void setLastRestarted(Long lastRestarted) {
-this.last_restarted = DateTimeHelper.format(lastRestarted);
+this.last_restarted = null == lastRestarted ? null
+: DateTimeHelper.format(lastRestarted);
   }
 
   public Long getLastRestarted() {
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 2943601..24546dd 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -324,7 +324,8 @@ public class NodeStatus extends Document {
   private String version;
 
   public void setVersion(String version) {
-this.version = version.substring(version.lastIndexOf(" ") + 1);
+this.version = null == version ? null
+: version.substring(version.lastIndexOf(" ") + 1);
   }
 
   public String getVersion() {
diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index ff14d75..04a04fa 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -158,15 +158,13 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   /* Already parsed more recent server descriptor from this relay. */
   return;
 }
-long lastRestartedMillis = descriptor.getPublishedMillis()
-- descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
 int bandwidthRate = descriptor.getBandwidthRate();
 int bandwidthBurst = descriptor.getBandwidthBurst();
 int observedBandwidth = descriptor.getBandwidthObserved();
 int advertisedBandwidth = Math.min(bandwidthRate,
 Math.min(bandwidthBurst, observedBandwidth));
 detailsStatus.setDescPublished(descriptor.getPublishedMillis());
-detailsStatus.setLastRestarted(lastRestartedMillis);
+detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor));
 detailsStatus.setBandwidthRate(bandwidthRate);
 detailsStatus.setBandwidthBurst(bandwidthBurst);
 detailsStatus.setObservedBandwidth(observedBandwidth);
@@ -204,6 +202,15 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 this.documentStore.store(detailsStatus, fingerprint);
   }
 
+  private Long calculateLastRestartedMillis(ServerDescriptor descriptor) {
+Long lastRestartedMillis = null;
+if (null != descriptor.getUptime()) {
+  lastRestartedMillis = descriptor.getPublishedMillis()
+  - descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
+}
+return lastRestartedMillis;
+  }
+
   private Map> exitListEntries = new HashMap<>();
 
   private void processExitList(ExitList exitList) {
@@ -318,13 +325,11 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   /* Already parsed more recent server descriptor from this bridge. */
   return;
 }
-long lastRestartedMillis = descriptor.getPublishedMillis()
-- descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
 int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(),
 Math.min(descriptor.getBandwidthBurst(),
 descriptor.getBandwidthObserved()));
 

[tor-commits] [onionoo/release] Bump version to 4.2-1.6.0-dev.

[karsten]

commit da9fe314bfa089536dbbd4901b737e36bd5b9cc6
Author: Karsten Loesing 
Date:   Tue Oct 17 21:19:46 2017 +0200

Bump version to 4.2-1.6.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index ee3c0da..5f072bb 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.6.0-dev"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Prepare for 4.2-1.6.1 release.

[karsten]

commit 8946c7ea9eb81edfc32a5ef3f5f9a11c9d552733
Author: Karsten Loesing 
Date:   Thu Oct 26 20:50:30 2017 +0200

Prepare for 4.2-1.6.1 release.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 5f072bb..25477df 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
   
   
   
+value="${onionoo.protocol.version}-1.6.1"/>
   
   
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Fix two NullPointerExceptions.

[karsten]

commit 563f762ca7eeb649ac3d8777f5924d9c66cfd760
Author: Karsten Loesing 
Date:   Thu Oct 26 10:28:11 2017 +0200

Fix two NullPointerExceptions.

There's a relay running an alternate Tor version that produces
descriptors without "uptime" line, and the directory authorities don't
include a "v" line for that relay, likely because its platform string
does not include the magic word "Tor".

Fixes #24012.
---
 CHANGELOG.md|  8 
 .../java/org/torproject/onionoo/docs/DetailsStatus.java |  3 ++-
 .../java/org/torproject/onionoo/docs/NodeStatus.java|  3 ++-
 .../onionoo/updater/NodeDetailsStatusUpdater.java   | 17 +++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2aff31..ca17fa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Changes in version 4.2-1.6.1 - 2017-10-2?
+
+ * Medium changes
+   - Fix two NullPointerExceptions caused by accessing optional parts
+ of relay server descriptors and consensuses without checking
+ first whether they're available or not.
+
+
 # Changes in version 4.2-1.6.0 - 2017-10-09
 
  * Medium changes
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
index 0a0c215..faec117 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
@@ -45,7 +45,8 @@ public class DetailsStatus extends Document {
   private String last_restarted;
 
   public void setLastRestarted(Long lastRestarted) {
-this.last_restarted = DateTimeHelper.format(lastRestarted);
+this.last_restarted = null == lastRestarted ? null
+: DateTimeHelper.format(lastRestarted);
   }
 
   public Long getLastRestarted() {
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 2943601..24546dd 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -324,7 +324,8 @@ public class NodeStatus extends Document {
   private String version;
 
   public void setVersion(String version) {
-this.version = version.substring(version.lastIndexOf(" ") + 1);
+this.version = null == version ? null
+: version.substring(version.lastIndexOf(" ") + 1);
   }
 
   public String getVersion() {
diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index ff14d75..04a04fa 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -158,15 +158,13 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   /* Already parsed more recent server descriptor from this relay. */
   return;
 }
-long lastRestartedMillis = descriptor.getPublishedMillis()
-- descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
 int bandwidthRate = descriptor.getBandwidthRate();
 int bandwidthBurst = descriptor.getBandwidthBurst();
 int observedBandwidth = descriptor.getBandwidthObserved();
 int advertisedBandwidth = Math.min(bandwidthRate,
 Math.min(bandwidthBurst, observedBandwidth));
 detailsStatus.setDescPublished(descriptor.getPublishedMillis());
-detailsStatus.setLastRestarted(lastRestartedMillis);
+detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor));
 detailsStatus.setBandwidthRate(bandwidthRate);
 detailsStatus.setBandwidthBurst(bandwidthBurst);
 detailsStatus.setObservedBandwidth(observedBandwidth);
@@ -204,6 +202,15 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
 this.documentStore.store(detailsStatus, fingerprint);
   }
 
+  private Long calculateLastRestartedMillis(ServerDescriptor descriptor) {
+Long lastRestartedMillis = null;
+if (null != descriptor.getUptime()) {
+  lastRestartedMillis = descriptor.getPublishedMillis()
+  - descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
+}
+return lastRestartedMillis;
+  }
+
   private Map> exitListEntries = new HashMap<>();
 
   private void processExitList(ExitList exitList) {
@@ -318,13 +325,11 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   /* Already parsed more recent server descriptor from this bridge. */
   return;
 }
-long lastRestartedMillis = descriptor.getPublishedMillis()
-- descriptor.getUptime() * DateTimeHelper.ONE_SECOND;
 int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(),
 Math.min(descriptor.getBandwidthBurst(),
 descriptor.getBandwidthObserved()));
 

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

[translation]

commit 3e8ed8d28ccbf3bfed8c174c2cce083950bb1549
Author: Translation commit bot 
Date:   Thu Oct 26 16:18:40 2017 +

Update translations for tails-openpgp-applet
---
 ar/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot
index 078fdff74..67a4bdfc8 100644
--- a/ar/openpgp-applet.pot
+++ b/ar/openpgp-applet.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2017-09-23 21:55+\n"
+"PO-Revision-Date: 2017-10-26 16:06+\n"
 "Last-Translator: Singapore Goldindor\n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Revert "Temporarily disable compilation of the v3 hs fuzzing code"

[nickm]

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023
Author: David Goulet 
Date:   Thu Oct 26 09:41:47 2017 -0400

Revert "Temporarily disable compilation of the v3 hs fuzzing code"

This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403.
---
 scripts/codegen/fuzzing_include_am.py |  1 +
 src/test/fuzz/include.am  | 28 +---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/scripts/codegen/fuzzing_include_am.py 
b/scripts/codegen/fuzzing_include_am.py
index e01bc8daa..fee6d4494 100755
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -7,6 +7,7 @@ FUZZERS = """
diff-apply
extrainfo
hsdescv2
+   hsdescv3
http
 http-connect
iptsv2
diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index 472cbfc8a..cd16dc05b 100644
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -17,9 +17,8 @@ FUZZING_LIBS = \
src/trunnel/libor-trunnel-testing.a \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-   @TOR_LIBEVENT_LIBS@ \
-   @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-   @CURVE25519_LIBS@ \
+   @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+   @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@ \
@TOR_LZMA_LIBS@ \
@TOR_ZSTD_LIBS@
@@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
 
+src_test_fuzz_fuzz_hsdescv3_SOURCES = \
+   src/test/fuzz/fuzzing_common.c \
+   src/test/fuzz/fuzz_hsdescv3.c
+src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS)
+src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS)
+src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG)
+src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS)
+
 src_test_fuzz_fuzz_http_SOURCES = \
src/test/fuzz/fuzzing_common.c \
src/test/fuzz/fuzz_http.c
@@ -142,6 +149,7 @@ FUZZERS = \
src/test/fuzz/fuzz-diff-apply \
src/test/fuzz/fuzz-extrainfo \
src/test/fuzz/fuzz-hsdescv2 \
+   src/test/fuzz/fuzz-hsdescv3 \
src/test/fuzz/fuzz-http \
src/test/fuzz/fuzz-http-connect \
src/test/fuzz/fuzz-iptsv2 \
@@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
 
+src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG)
+src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS)
+
 src_test_fuzz_lf_fuzz_http_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \
src/test/fuzz/lf-fuzz-diff-apply \
src/test/fuzz/lf-fuzz-extrainfo \
src/test/fuzz/lf-fuzz-hsdescv2 \
+   src/test/fuzz/lf-fuzz-hsdescv3 \
src/test/fuzz/lf-fuzz-http \
src/test/fuzz/lf-fuzz-http-connect \
src/test/fuzz/lf-fuzz-iptsv2 \
@@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 
+src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+
 src_test_fuzz_liboss_fuzz_http_a_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \
src/test/fuzz/liboss-fuzz-diff-apply.a \
src/test/fuzz/liboss-fuzz-extrainfo.a \
src/test/fuzz/liboss-fuzz-hsdescv2.a \
+   src/test/fuzz/liboss-fuzz-hsdescv3.a \
src/test/fuzz/liboss-fuzz-http.a \
src/test/fuzz/liboss-fuzz-http-connect.a \
src/test/fuzz/liboss-fuzz-iptsv2.a \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] fuzzing: Make hsdescv3 use the decoding API correctly

[nickm]

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58
Author: David Goulet 
Date:   Thu Oct 26 09:52:15 2017 -0400

fuzzing: Make hsdescv3 use the decoding API correctly

Fixes #21509

Signed-off-by: David Goulet 
---
 changes/bug21509  | 3 +++
 src/test/fuzz/fuzz_hsdescv3.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug21509 b/changes/bug21509
new file mode 100644
index 0..593a01ef2
--- /dev/null
+++ b/changes/bug21509
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hidden service v3, fuzzing):
+- Fix the hidden service v3 descriptor decoding fuzzing to use the latest
+  decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c
index 3fd21148f..03c509e2e 100644
--- a/src/test/fuzz/fuzz_hsdescv3.c
+++ b/src/test/fuzz/fuzz_hsdescv3.c
@@ -55,10 +55,12 @@ int
 fuzz_main(const uint8_t *data, size_t sz)
 {
   hs_descriptor_t *desc = NULL;
+  uint8_t subcredential[DIGEST256_LEN];
 
   char *fuzzing_data = tor_memdup_nulterm(data, sz);
+  memset(subcredential, 'A', sizeof(subcredential));
 
-  hs_desc_decode_descriptor(fuzzing_data, NULL, );
+  hs_desc_decode_descriptor(fuzzing_data, subcredential, );
   if (desc) {
 log_debug(LD_GENERAL, "Decoding okay");
 hs_descriptor_free(desc);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm]

commit 4af1653e0f5fe305aff340e7b7f47c1f965ef3ca
Merge: dfe03a55f c4ef21ff5
Author: Nick Mathewson 
Date:   Thu Oct 26 10:43:05 2017 -0400

Merge branch 'maint-0.3.2'

 changes/bug21509  |  3 +++
 scripts/codegen/fuzzing_include_am.py |  1 +
 src/test/fuzz/fuzz_hsdescv3.c |  4 +++-
 src/test/fuzz/include.am  | 28 +---
 4 files changed, 32 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] fuzzing: Make hsdescv3 use the decoding API correctly

[nickm]

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58
Author: David Goulet 
Date:   Thu Oct 26 09:52:15 2017 -0400

fuzzing: Make hsdescv3 use the decoding API correctly

Fixes #21509

Signed-off-by: David Goulet 
---
 changes/bug21509  | 3 +++
 src/test/fuzz/fuzz_hsdescv3.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug21509 b/changes/bug21509
new file mode 100644
index 0..593a01ef2
--- /dev/null
+++ b/changes/bug21509
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hidden service v3, fuzzing):
+- Fix the hidden service v3 descriptor decoding fuzzing to use the latest
+  decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c
index 3fd21148f..03c509e2e 100644
--- a/src/test/fuzz/fuzz_hsdescv3.c
+++ b/src/test/fuzz/fuzz_hsdescv3.c
@@ -55,10 +55,12 @@ int
 fuzz_main(const uint8_t *data, size_t sz)
 {
   hs_descriptor_t *desc = NULL;
+  uint8_t subcredential[DIGEST256_LEN];
 
   char *fuzzing_data = tor_memdup_nulterm(data, sz);
+  memset(subcredential, 'A', sizeof(subcredential));
 
-  hs_desc_decode_descriptor(fuzzing_data, NULL, );
+  hs_desc_decode_descriptor(fuzzing_data, subcredential, );
   if (desc) {
 log_debug(LD_GENERAL, "Decoding okay");
 hs_descriptor_free(desc);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Revert "Temporarily disable compilation of the v3 hs fuzzing code"

[nickm]

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023
Author: David Goulet 
Date:   Thu Oct 26 09:41:47 2017 -0400

Revert "Temporarily disable compilation of the v3 hs fuzzing code"

This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403.
---
 scripts/codegen/fuzzing_include_am.py |  1 +
 src/test/fuzz/include.am  | 28 +---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/scripts/codegen/fuzzing_include_am.py 
b/scripts/codegen/fuzzing_include_am.py
index e01bc8daa..fee6d4494 100755
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -7,6 +7,7 @@ FUZZERS = """
diff-apply
extrainfo
hsdescv2
+   hsdescv3
http
 http-connect
iptsv2
diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index 472cbfc8a..cd16dc05b 100644
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -17,9 +17,8 @@ FUZZING_LIBS = \
src/trunnel/libor-trunnel-testing.a \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-   @TOR_LIBEVENT_LIBS@ \
-   @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-   @CURVE25519_LIBS@ \
+   @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+   @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@ \
@TOR_LZMA_LIBS@ \
@TOR_ZSTD_LIBS@
@@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
 
+src_test_fuzz_fuzz_hsdescv3_SOURCES = \
+   src/test/fuzz/fuzzing_common.c \
+   src/test/fuzz/fuzz_hsdescv3.c
+src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS)
+src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS)
+src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG)
+src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS)
+
 src_test_fuzz_fuzz_http_SOURCES = \
src/test/fuzz/fuzzing_common.c \
src/test/fuzz/fuzz_http.c
@@ -142,6 +149,7 @@ FUZZERS = \
src/test/fuzz/fuzz-diff-apply \
src/test/fuzz/fuzz-extrainfo \
src/test/fuzz/fuzz-hsdescv2 \
+   src/test/fuzz/fuzz-hsdescv3 \
src/test/fuzz/fuzz-http \
src/test/fuzz/fuzz-http-connect \
src/test/fuzz/fuzz-iptsv2 \
@@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
 
+src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG)
+src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS)
+
 src_test_fuzz_lf_fuzz_http_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \
src/test/fuzz/lf-fuzz-diff-apply \
src/test/fuzz/lf-fuzz-extrainfo \
src/test/fuzz/lf-fuzz-hsdescv2 \
+   src/test/fuzz/lf-fuzz-hsdescv3 \
src/test/fuzz/lf-fuzz-http \
src/test/fuzz/lf-fuzz-http-connect \
src/test/fuzz/lf-fuzz-iptsv2 \
@@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 
+src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+
 src_test_fuzz_liboss_fuzz_http_a_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \
src/test/fuzz/liboss-fuzz-diff-apply.a \
src/test/fuzz/liboss-fuzz-extrainfo.a \
src/test/fuzz/liboss-fuzz-hsdescv2.a \
+   src/test/fuzz/liboss-fuzz-hsdescv3.a \
src/test/fuzz/liboss-fuzz-http.a \
src/test/fuzz/liboss-fuzz-http-connect.a \
src/test/fuzz/liboss-fuzz-iptsv2.a \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] fuzzing: Make hsdescv3 use the decoding API correctly

[nickm]

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58
Author: David Goulet 
Date:   Thu Oct 26 09:52:15 2017 -0400

fuzzing: Make hsdescv3 use the decoding API correctly

Fixes #21509

Signed-off-by: David Goulet 
---
 changes/bug21509  | 3 +++
 src/test/fuzz/fuzz_hsdescv3.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug21509 b/changes/bug21509
new file mode 100644
index 0..593a01ef2
--- /dev/null
+++ b/changes/bug21509
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hidden service v3, fuzzing):
+- Fix the hidden service v3 descriptor decoding fuzzing to use the latest
+  decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c
index 3fd21148f..03c509e2e 100644
--- a/src/test/fuzz/fuzz_hsdescv3.c
+++ b/src/test/fuzz/fuzz_hsdescv3.c
@@ -55,10 +55,12 @@ int
 fuzz_main(const uint8_t *data, size_t sz)
 {
   hs_descriptor_t *desc = NULL;
+  uint8_t subcredential[DIGEST256_LEN];
 
   char *fuzzing_data = tor_memdup_nulterm(data, sz);
+  memset(subcredential, 'A', sizeof(subcredential));
 
-  hs_desc_decode_descriptor(fuzzing_data, NULL, );
+  hs_desc_decode_descriptor(fuzzing_data, subcredential, );
   if (desc) {
 log_debug(LD_GENERAL, "Decoding okay");
 hs_descriptor_free(desc);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Revert "Temporarily disable compilation of the v3 hs fuzzing code"

[nickm]

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023
Author: David Goulet 
Date:   Thu Oct 26 09:41:47 2017 -0400

Revert "Temporarily disable compilation of the v3 hs fuzzing code"

This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403.
---
 scripts/codegen/fuzzing_include_am.py |  1 +
 src/test/fuzz/include.am  | 28 +---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/scripts/codegen/fuzzing_include_am.py 
b/scripts/codegen/fuzzing_include_am.py
index e01bc8daa..fee6d4494 100755
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -7,6 +7,7 @@ FUZZERS = """
diff-apply
extrainfo
hsdescv2
+   hsdescv3
http
 http-connect
iptsv2
diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index 472cbfc8a..cd16dc05b 100644
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -17,9 +17,8 @@ FUZZING_LIBS = \
src/trunnel/libor-trunnel-testing.a \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
-   @TOR_LIBEVENT_LIBS@ \
-   @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
-   @CURVE25519_LIBS@ \
+   @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+   @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@ \
@TOR_LZMA_LIBS@ \
@TOR_ZSTD_LIBS@
@@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
 src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
 src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
 
+src_test_fuzz_fuzz_hsdescv3_SOURCES = \
+   src/test/fuzz/fuzzing_common.c \
+   src/test/fuzz/fuzz_hsdescv3.c
+src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS)
+src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS)
+src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG)
+src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS)
+
 src_test_fuzz_fuzz_http_SOURCES = \
src/test/fuzz/fuzzing_common.c \
src/test/fuzz/fuzz_http.c
@@ -142,6 +149,7 @@ FUZZERS = \
src/test/fuzz/fuzz-diff-apply \
src/test/fuzz/fuzz-extrainfo \
src/test/fuzz/fuzz-hsdescv2 \
+   src/test/fuzz/fuzz-hsdescv3 \
src/test/fuzz/fuzz-http \
src/test/fuzz/fuzz-http-connect \
src/test/fuzz/fuzz-iptsv2 \
@@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
 src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
 src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
 
+src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS)
+src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG)
+src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS)
+
 src_test_fuzz_lf_fuzz_http_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \
src/test/fuzz/lf-fuzz-diff-apply \
src/test/fuzz/lf-fuzz-extrainfo \
src/test/fuzz/lf-fuzz-hsdescv2 \
+   src/test/fuzz/lf-fuzz-hsdescv3 \
src/test/fuzz/lf-fuzz-http \
src/test/fuzz/lf-fuzz-http-connect \
src/test/fuzz/lf-fuzz-iptsv2 \
@@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
 src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 
+src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
+   $(src_test_fuzz_fuzz_hsdescv3_SOURCES)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
+src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
+
 src_test_fuzz_liboss_fuzz_http_a_SOURCES = \
$(src_test_fuzz_fuzz_http_SOURCES)
 src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \
src/test/fuzz/liboss-fuzz-diff-apply.a \
src/test/fuzz/liboss-fuzz-extrainfo.a \
src/test/fuzz/liboss-fuzz-hsdescv2.a \
+   src/test/fuzz/liboss-fuzz-hsdescv3.a \
src/test/fuzz/liboss-fuzz-http.a \
src/test/fuzz/liboss-fuzz-http-connect.a \
src/test/fuzz/liboss-fuzz-iptsv2.a \



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] doc: Add fedora packager point of contact

[nickm]

commit dfe03a55fcf8071fef65a3998022d87848135b06
Author: David Goulet 
Date:   Thu Oct 26 10:07:56 2017 -0400

doc: Add fedora packager point of contact

This is a link to the user page on the Fedora project website:

https://koji.fedoraproject.org/koji/userinfo?userID=2234

Fixes #24015

Signed-off-by: David Goulet 
---
 doc/HACKING/ReleasingTor.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index 62029b44f..fc7326934 100644
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -172,6 +172,7 @@ new Tor release:
- {tails-rm} at boum dot org
- {simon} at sdeziel.info
- {yuri} at rawbw.com
+   - {mh+tor} at scrit.ch
 
 4. Add the version number to Trac.  To do this, go to Trac, log in,
 select "Admin" near the top of the screen, then select "Versions" from

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] fix check-changes warning

[nickm]

commit 62cd64cc166081b17a0cf1fc9abd422c71e1f17b
Author: Nick Mathewson 
Date:   Thu Oct 26 09:08:49 2017 -0400

fix check-changes warning
---
 changes/{bug23682 => bug23862} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/changes/bug23682 b/changes/bug23862
similarity index 100%
rename from changes/bug23682
rename to changes/bug23862

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Remove a duplicate call to update_microdesc_downloads()

[nickm]

commit 42a47c0e7da425a55b77aafe2dda2fea7563c761
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:38 2017 +0300

Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
---
 src/or/directory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 6470723cd..7a1364bd7 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2669,11 +2669,11 @@ handle_response_fetch_consensus(dir_connection_t *conn,
   /* If we launched other fetches for this consensus, cancel them. */
   connection_dir_close_consensus_fetches(conn, flavname);
 
-  /* launches router downloads as needed */
+  /* update the list of routers and directory guards */
   routers_update_all_from_networkstatus(now, 3);
   update_microdescs_from_networkstatus(now);
-  update_microdesc_downloads(now);
   directory_info_has_arrived(now, 0, 0);
+
   if (authdir_mode_v3(get_options())) {
 sr_act_post_consensus(
  networkstatus_get_latest_consensus_by_flavor(FLAV_NS));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add changes file for #23862.

[nickm]

commit e0276dc1c64d4c2c9439e080d006dfb249fc7c53
Author: George Kadianakis 
Date:   Wed Oct 25 19:54:48 2017 +0300

Add changes file for #23862.
---
 changes/bug23682 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23682 b/changes/bug23682
new file mode 100644
index 0..301ce7367
--- /dev/null
+++ b/changes/bug23682
@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+- Tor now updates its guard state when it reads a consensus regardless of
+  whether it's missing descriptors. That makes tor use its primary guards
+  to fetch descriptors in some edge cases where it would have used fallback
+  directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Update entry guard state whenever we download a consensus.

[nickm]

commit cbc70437a7318f8e5abef0829ba8e02298ae53e2
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:25 2017 +0300

Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha
---
 src/or/main.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 65b0b8f4d..c340e4128 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -971,6 +971,15 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
 {
   const or_options_t *options = get_options();
 
+  /* if we have enough dir info, then update our guard status with
+   * whatever we just learned. */
+  int invalidate_circs = guards_update_all();
+
+  if (invalidate_circs) {
+circuit_mark_all_unused_circs();
+circuit_mark_all_dirty_circs_as_unusable();
+  }
+
   if (!router_have_minimum_dir_info()) {
 int quiet = suppress_logs || from_cache ||
 directory_too_idle_to_fetch_descriptors(options, now);
@@ -984,15 +993,6 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
   update_all_descriptor_downloads(now);
 }
 
-/* if we have enough dir info, then update our guard status with
- * whatever we just learned. */
-int invalidate_circs = guards_update_all();
-
-if (invalidate_circs) {
-  circuit_mark_all_unused_circs();
-  circuit_mark_all_dirty_circs_as_unusable();
-}
-
 /* Don't even bother trying to get extrainfo until the rest of our
  * directory info is up-to-date */
 if (options->DownloadExtraInfo)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a unittest that reveals the offending case of #23862.

[nickm]

commit 8c8d3b90f767076508944f4eb355180e14b6189e
Author: George Kadianakis 
Date:   Wed Oct 25 19:25:53 2017 +0300

Add a unittest that reveals the offending case of #23862.
---
 src/or/directory.c |   4 +-
 src/or/directory.h |   3 ++
 src/or/entrynodes.c|   6 +--
 src/or/entrynodes.h|   4 ++
 src/or/networkstatus.c |   2 +-
 src/test/test_routerlist.c | 110 +
 6 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 6470723cd..272b324db 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2237,8 +2237,6 @@ load_downloaded_routers(const char *body, smartlist_t 
*which,
   return added;
 }
 
-static int handle_response_fetch_consensus(dir_connection_t *,
-   const response_handler_args_t *);
 static int handle_response_fetch_certificate(dir_connection_t *,
  const response_handler_args_t *);
 static int handle_response_fetch_status_vote(dir_connection_t *,
@@ -2585,7 +2583,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
  * consensus document by checking the consensus, storing it, and marking
  * router requests as reachable.
  **/
-static int
+STATIC int
 handle_response_fetch_consensus(dir_connection_t *conn,
 const response_handler_args_t *args)
 {
diff --git a/src/or/directory.h b/src/or/directory.h
index 79984be32..764f0092e 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -194,6 +194,9 @@ STATIC void 
warn_disallowed_anonymous_compression_method(compress_method_t);
 STATIC int handle_response_fetch_hsdesc_v3(dir_connection_t *conn,
   const response_handler_args_t *args);
 
+STATIC int handle_response_fetch_consensus(dir_connection_t *conn,
+ const response_handler_args_t *args);
+
 #endif /* defined(DIRECTORY_PRIVATE) */
 
 #ifdef TOR_UNIT_TESTS
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 9fbf42643..76a8f591b 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2126,9 +2126,9 @@ circuit_guard_state_free(circuit_guard_state_t *state)
 
 /** Allocate and return a new circuit_guard_state_t to track the result
  * of using guard for a given operation. */
-static circuit_guard_state_t *
-circuit_guard_state_new(entry_guard_t *guard, unsigned state,
-entry_guard_restriction_t *rst)
+MOCK_IMPL(STATIC circuit_guard_state_t *,
+circuit_guard_state_new,(entry_guard_t *guard, unsigned state,
+ entry_guard_restriction_t *rst))
 {
   circuit_guard_state_t *result;
 
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index 9e1e72993..86f0517df 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -488,6 +488,10 @@ STATIC entry_guard_t 
*get_sampled_guard_with_id(guard_selection_t *gs,
 
 MOCK_DECL(STATIC time_t, randomize_time, (time_t now, time_t max_backdate));
 
+MOCK_DECL(STATIC circuit_guard_state_t *,
+  circuit_guard_state_new,(entry_guard_t *guard, unsigned state,
+   entry_guard_restriction_t *rst));
+
 STATIC entry_guard_t *entry_guard_add_to_sample(guard_selection_t *gs,
 const node_t *node);
 STATIC entry_guard_t *entry_guards_expand_sample(guard_selection_t *gs);
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 3a4f06fb7..abcd4d865 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1720,7 +1720,7 @@ networkstatus_set_current_consensus(const char *consensus,
 {
   networkstatus_t *c=NULL;
   int r, result = -1;
-  time_t now = time(NULL);
+  time_t now = approx_time();
   const or_options_t *options = get_options();
   char *unverified_fname = NULL, *consensus_fname = NULL;
   int flav = networkstatus_parse_flavor_name(flavor);
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 3b0e943ce..b131dd959 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -6,13 +6,17 @@
 #include 
 
 #define DIRVOTE_PRIVATE
+#define ENTRYNODES_PRIVATE
+#define DIRECTORY_PRIVATE
 #define NETWORKSTATUS_PRIVATE
+#define CONNECTION_PRIVATE
 #define ROUTERLIST_PRIVATE
 #define TOR_UNIT_TESTING
 #include "or.h"
 #include "config.h"
 #include "connection.h"
 #include "container.h"
+#include "control.h"
 #include "directory.h"
 #include "dirvote.h"
 #include "entrynodes.h"
@@ -22,10 +26,13 @@
 #include "policies.h"
 #include "router.h"
 #include "routerlist.h"
+#include "routerset.h"
 #include "routerparse.h"
 #include "shared_random.h"
+#include "statefile.h"
 #include "test.h"
 #include "test_dir_common.h"
+#include "log_test_helpers.h"
 
 void construct_consensus(char **consensus_text_md);
 
@@ -411,6 +418,107 @@ test_router_pick_directory_server_impl(void *arg)
   

[tor-commits] [tor/master] Fix offending unittest and add changes file for #23862.

[nickm]

commit 1a6814c096b0fa6fbfd2a1688b29dbc8143d6568
Author: George Kadianakis 
Date:   Wed Oct 25 19:54:48 2017 +0300

Fix offending unittest and add changes file for #23862.
---
 changes/bug23682   | 5 +
 src/test/test_routerlist.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug23682 b/changes/bug23682
new file mode 100644
index 0..301ce7367
--- /dev/null
+++ b/changes/bug23682
@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+- Tor now updates its guard state when it reads a consensus regardless of
+  whether it's missing descriptors. That makes tor use its primary guards
+  to fetch descriptors in some edge cases where it would have used fallback
+  directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.
\ No newline at end of file
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index b131dd959..81451a4bc 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -508,8 +508,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg)
   tt_int_op(retval, OP_EQ, 0);
 
   /* Make sure that our primary guard was chosen */
-  /* BUG #23862 falls back to dirserver list!! */
-  expect_log_msg_containing("falling back to dirserver list");
+  expect_log_msg_containing("Selected primary guard router3");
 
  done:
   tor_free(consensus_text_md);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Update entry guard state whenever we download a consensus.

[nickm]

commit 10c5eae3fa4f26027c6335cab607a5de550458db
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:25 2017 +0300

Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha
---
 src/or/main.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index be6162834..4ab5f311f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -971,6 +971,15 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
 {
   const or_options_t *options = get_options();
 
+  /* if we have enough dir info, then update our guard status with
+   * whatever we just learned. */
+  int invalidate_circs = guards_update_all();
+
+  if (invalidate_circs) {
+circuit_mark_all_unused_circs();
+circuit_mark_all_dirty_circs_as_unusable();
+  }
+
   if (!router_have_minimum_dir_info()) {
 int quiet = suppress_logs || from_cache ||
 directory_too_idle_to_fetch_descriptors(options, now);
@@ -984,15 +993,6 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
   update_all_descriptor_downloads(now);
 }
 
-/* if we have enough dir info, then update our guard status with
- * whatever we just learned. */
-int invalidate_circs = guards_update_all();
-
-if (invalidate_circs) {
-  circuit_mark_all_unused_circs();
-  circuit_mark_all_dirty_circs_as_unusable();
-}
-
 /* Don't even bother trying to get extrainfo until the rest of our
  * directory info is up-to-date */
 if (options->DownloadExtraInfo)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Remove a duplicate call to update_microdesc_downloads()

[nickm]

commit dfd3ed5bdc252ad2c3afed922e5dcd955eff1d68
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:38 2017 +0300

Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
---
 src/or/directory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 272b324db..777972d57 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2667,11 +2667,11 @@ handle_response_fetch_consensus(dir_connection_t *conn,
   /* If we launched other fetches for this consensus, cancel them. */
   connection_dir_close_consensus_fetches(conn, flavname);
 
-  /* launches router downloads as needed */
+  /* update the list of routers and directory guards */
   routers_update_all_from_networkstatus(now, 3);
   update_microdescs_from_networkstatus(now);
-  update_microdesc_downloads(now);
   directory_info_has_arrived(now, 0, 0);
+
   if (authdir_mode_v3(get_options())) {
 sr_act_post_consensus(
  networkstatus_get_latest_consensus_by_flavor(FLAV_NS));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] remove now-redundant changes file

[nickm]

commit 636d0ad68bf134a7dbeabdf83b70763f88fbc970
Author: Nick Mathewson 
Date:   Thu Oct 26 09:09:37 2017 -0400

remove now-redundant changes file
---
 changes/bug23682 | 5 -
 1 file changed, 5 deletions(-)

diff --git a/changes/bug23682 b/changes/bug23682
deleted file mode 100644
index 301ce7367..0
--- a/changes/bug23682
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (entry guards):
-- Tor now updates its guard state when it reads a consensus regardless of
-  whether it's missing descriptors. That makes tor use its primary guards
-  to fetch descriptors in some edge cases where it would have used fallback
-  directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug23862_v2'

[nickm]

commit e4f02f6c18dfac31ccdb684558a98ea570187491
Merge: 78222831a 1a6814c09
Author: Nick Mathewson 
Date:   Thu Oct 26 09:09:14 2017 -0400

Merge remote-tracking branch 'asn/bug23862_v2'

 changes/bug23682   |   5 +++
 src/or/directory.c |   4 +-
 src/or/directory.h |   3 ++
 src/or/entrynodes.c|   6 +--
 src/or/entrynodes.h|   4 ++
 src/or/networkstatus.c |   2 +-
 src/test/test_routerlist.c | 109 +
 7 files changed, 126 insertions(+), 7 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm]

commit 78222831a0e7c55da2e409b3dd016fdeffbe37f8
Merge: be49fadad 62cd64cc1
Author: Nick Mathewson 
Date:   Thu Oct 26 09:08:52 2017 -0400

Merge branch 'maint-0.3.2'

 changes/{bug23682 => bug23862} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] fix check-changes warning

[nickm]

commit 62cd64cc166081b17a0cf1fc9abd422c71e1f17b
Author: Nick Mathewson 
Date:   Thu Oct 26 09:08:49 2017 -0400

fix check-changes warning
---
 changes/{bug23682 => bug23862} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/changes/bug23682 b/changes/bug23862
similarity index 100%
rename from changes/bug23682
rename to changes/bug23862



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add changes file for #23862.

[nickm]

commit e0276dc1c64d4c2c9439e080d006dfb249fc7c53
Author: George Kadianakis 
Date:   Wed Oct 25 19:54:48 2017 +0300

Add changes file for #23862.
---
 changes/bug23682 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23682 b/changes/bug23682
new file mode 100644
index 0..301ce7367
--- /dev/null
+++ b/changes/bug23682
@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+- Tor now updates its guard state when it reads a consensus regardless of
+  whether it's missing descriptors. That makes tor use its primary guards
+  to fetch descriptors in some edge cases where it would have used fallback
+  directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] fix check-changes warning

[nickm]

commit 62cd64cc166081b17a0cf1fc9abd422c71e1f17b
Author: Nick Mathewson 
Date:   Thu Oct 26 09:08:49 2017 -0400

fix check-changes warning
---
 changes/{bug23682 => bug23862} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/changes/bug23682 b/changes/bug23862
similarity index 100%
rename from changes/bug23682
rename to changes/bug23862

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add changes file for #23862.

[nickm]

commit e0276dc1c64d4c2c9439e080d006dfb249fc7c53
Author: George Kadianakis 
Date:   Wed Oct 25 19:54:48 2017 +0300

Add changes file for #23862.
---
 changes/bug23682 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23682 b/changes/bug23682
new file mode 100644
index 0..301ce7367
--- /dev/null
+++ b/changes/bug23682
@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+- Tor now updates its guard state when it reads a consensus regardless of
+  whether it's missing descriptors. That makes tor use its primary guards
+  to fetch descriptors in some edge cases where it would have used fallback
+  directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Update entry guard state whenever we download a consensus.

[nickm]

commit cbc70437a7318f8e5abef0829ba8e02298ae53e2
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:25 2017 +0300

Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha
---
 src/or/main.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 65b0b8f4d..c340e4128 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -971,6 +971,15 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
 {
   const or_options_t *options = get_options();
 
+  /* if we have enough dir info, then update our guard status with
+   * whatever we just learned. */
+  int invalidate_circs = guards_update_all();
+
+  if (invalidate_circs) {
+circuit_mark_all_unused_circs();
+circuit_mark_all_dirty_circs_as_unusable();
+  }
+
   if (!router_have_minimum_dir_info()) {
 int quiet = suppress_logs || from_cache ||
 directory_too_idle_to_fetch_descriptors(options, now);
@@ -984,15 +993,6 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
   update_all_descriptor_downloads(now);
 }
 
-/* if we have enough dir info, then update our guard status with
- * whatever we just learned. */
-int invalidate_circs = guards_update_all();
-
-if (invalidate_circs) {
-  circuit_mark_all_unused_circs();
-  circuit_mark_all_dirty_circs_as_unusable();
-}
-
 /* Don't even bother trying to get extrainfo until the rest of our
  * directory info is up-to-date */
 if (options->DownloadExtraInfo)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Remove a duplicate call to update_microdesc_downloads()

[nickm]

commit 42a47c0e7da425a55b77aafe2dda2fea7563c761
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:38 2017 +0300

Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
---
 src/or/directory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 6470723cd..7a1364bd7 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2669,11 +2669,11 @@ handle_response_fetch_consensus(dir_connection_t *conn,
   /* If we launched other fetches for this consensus, cancel them. */
   connection_dir_close_consensus_fetches(conn, flavname);
 
-  /* launches router downloads as needed */
+  /* update the list of routers and directory guards */
   routers_update_all_from_networkstatus(now, 3);
   update_microdescs_from_networkstatus(now);
-  update_microdesc_downloads(now);
   directory_info_has_arrived(now, 0, 0);
+
   if (authdir_mode_v3(get_options())) {
 sr_act_post_consensus(
  networkstatus_get_latest_consensus_by_flavor(FLAV_NS));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm]

commit be49fadad02e74a5d1a175ea8bd4b8855f8ec728
Merge: 853bbb911 e0276dc1c
Author: Nick Mathewson 
Date:   Thu Oct 26 09:03:21 2017 -0400

Merge branch 'maint-0.3.2'

 changes/bug23682   |  5 +
 src/or/directory.c |  4 ++--
 src/or/main.c  | 18 +-
 3 files changed, 16 insertions(+), 11 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Update entry guard state whenever we download a consensus.

[nickm]

commit cbc70437a7318f8e5abef0829ba8e02298ae53e2
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:25 2017 +0300

Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha
---
 src/or/main.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 65b0b8f4d..c340e4128 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -971,6 +971,15 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
 {
   const or_options_t *options = get_options();
 
+  /* if we have enough dir info, then update our guard status with
+   * whatever we just learned. */
+  int invalidate_circs = guards_update_all();
+
+  if (invalidate_circs) {
+circuit_mark_all_unused_circs();
+circuit_mark_all_dirty_circs_as_unusable();
+  }
+
   if (!router_have_minimum_dir_info()) {
 int quiet = suppress_logs || from_cache ||
 directory_too_idle_to_fetch_descriptors(options, now);
@@ -984,15 +993,6 @@ directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs)
   update_all_descriptor_downloads(now);
 }
 
-/* if we have enough dir info, then update our guard status with
- * whatever we just learned. */
-int invalidate_circs = guards_update_all();
-
-if (invalidate_circs) {
-  circuit_mark_all_unused_circs();
-  circuit_mark_all_dirty_circs_as_unusable();
-}
-
 /* Don't even bother trying to get extrainfo until the rest of our
  * directory info is up-to-date */
 if (options->DownloadExtraInfo)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Remove a duplicate call to update_microdesc_downloads()

[nickm]

commit 42a47c0e7da425a55b77aafe2dda2fea7563c761
Author: George Kadianakis 
Date:   Wed Oct 25 19:18:38 2017 +0300

Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
---
 src/or/directory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 6470723cd..7a1364bd7 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2669,11 +2669,11 @@ handle_response_fetch_consensus(dir_connection_t *conn,
   /* If we launched other fetches for this consensus, cancel them. */
   connection_dir_close_consensus_fetches(conn, flavname);
 
-  /* launches router downloads as needed */
+  /* update the list of routers and directory guards */
   routers_update_all_from_networkstatus(now, 3);
   update_microdescs_from_networkstatus(now);
-  update_microdesc_downloads(now);
   directory_info_has_arrived(now, 0, 0);
+
   if (authdir_mode_v3(get_options())) {
 sr_act_post_consensus(
  networkstatus_get_latest_consensus_by_flavor(FLAV_NS));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Correct the multiplicity of the "p" line in microdescriptors

[nickm]

commit 0fd44031bfd6c6c822bfb194e54a05118c9625e2
Author: teor 
Date:   Thu Oct 26 16:00:00 2017 +1100

Correct the multiplicity of the "p" line in microdescriptors

These are all "at most once" items -- saying "zero times" implies
that we should reject md documents that include them, which isn't true.

Fixes 24007.
---
 dir-spec.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 7adcd76..ffbe4d3 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -3087,7 +3087,9 @@
 
 "p" ... NL
 
-[Zero times.]
+[At most once]
+
+Not currently generated.
 
 Exit policy summaries are contained in microdescriptors and
 therefore omitted in the microdescriptor consensus.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed

[translation]

commit ef779e9d20bcca626385cdb67ba745f4cfc1c3de
Author: Translation commit bot 
Date:   Thu Oct 26 12:17:06 2017 +

Update translations for tor-launcher-progress_completed
---
 nl_BE/progress.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nl_BE/progress.dtd b/nl_BE/progress.dtd
index 40774a03d..18788d9e4 100644
--- a/nl_BE/progress.dtd
+++ b/nl_BE/progress.dtd
@@ -1,4 +1,5 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress

[translation]

commit a3cbc9b8b0c97bce6d48e4b318524cb0eb4ecdf8
Author: Translation commit bot 
Date:   Thu Oct 26 12:17:00 2017 +

Update translations for tor-launcher-progress
---
 nl_BE/progress.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nl_BE/progress.dtd b/nl_BE/progress.dtd
index 9d01a142e..18788d9e4 100644
--- a/nl_BE/progress.dtd
+++ b/nl_BE/progress.dtd
@@ -1,4 +1,5 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck_completed] Update translations for torcheck_completed

[translation]

commit 4cf6f3c7dc7b5a622190c54e7405ac1485d10e6c
Author: Translation commit bot 
Date:   Thu Oct 26 12:15:26 2017 +

Update translations for torcheck_completed
---
 nl_BE/torcheck.po | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/nl_BE/torcheck.po b/nl_BE/torcheck.po
index 9470cf204..4fb057551 100644
--- a/nl_BE/torcheck.po
+++ b/nl_BE/torcheck.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
-# erwindelaat , 2014
+# Cleveridge , 2014
+# Joren Vandeweyer , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2014-02-19 09:12+\n"
-"Last-Translator: erwindelaat \n"
-"Language-Team: Dutch (Belgium) 
(http://www.transifex.com/projects/p/torproject/language/nl_BE/)\n"
+"PO-Revision-Date: 2017-10-26 11:58+\n"
+"Last-Translator: Joren Vandeweyer \n"
+"Language-Team: Dutch (Belgium) 
(http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid ""
 "the Internet anonymously."
 msgstr "Raadpleeg de https://www.torproject.org/\;>Tor-website 
voor meer informatie over hoe u Tor veilig kunt gebruiken.U kunt nu anoniem op 
het internet surfen."
 
-msgid "There is a security update available for the Tor Browser Bundle."
+msgid "There is a security update available for Tor Browser."
 msgstr "Er is een beveiligingsupdate beschikbaar voor de Tor Browser Bundle."
 
 msgid ""
@@ -92,3 +93,12 @@ msgstr "JavaScript is ingeschakeld"
 
 msgid "JavaScript is disabled."
 msgstr "JavaScript is uitgeschakeld"
+
+msgid "However, it does not appear to be Tor Browser."
+msgstr "Hoewel, dit lijkt niet de Tor Browser te zijn."
+
+msgid "Run a Relay"
+msgstr "Beheer een Relay"
+
+msgid "Stay Anonymous"
+msgstr "Blijf Anoniem"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

[translation]

commit faf0d42f3812c179075a284a759741312456d9a9
Author: Translation commit bot 
Date:   Thu Oct 26 12:16:35 2017 +

Update translations for torbirdy_completed
---
 nl/torbirdy.dtd   |  2 +-
 nl_BE/torbirdy.dtd| 58 +++
 nl_BE/torbirdy.properties | 18 +++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd
index d13131400..bfbec31c9 100644
--- a/nl/torbirdy.dtd
+++ b/nl/torbirdy.dtd
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
diff --git a/nl_BE/torbirdy.dtd b/nl_BE/torbirdy.dtd
new file mode 100644
index 0..01831dd34
--- /dev/null
+++ b/nl_BE/torbirdy.dtd
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nl_BE/torbirdy.properties b/nl_BE/torbirdy.properties
new file mode 100644
index 0..51a5e6d25
--- /dev/null
+++ b/nl_BE/torbirdy.properties
@@ -0,0 +1,18 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Ingeschakeld: Tor
+torbirdy.enabled.jondo=TorBirdy Ingeschakeld: JonDo
+torbirdy.enabled.custom=TorBirdy Ingeschakeld : Aangepaste Proxy
+torbirdy.enabled.torification=TorBirdy Ingeschakeld : Transparante Torificatie
+torbirdy.enabled.whonix=TorBirdy Ingeschakeld: Whonix
+torbirdy.disabled=TorBirdy: Uitgeschakeld!
+torbirdy.enabled=TorBirdy: Ingeschakeld
+
+torbirdy.email.prompt=TorBirdy heeft de automatische configuratiehulp van 
Thunderbird uitgeschakeld om uw anonimiteit te beschermen.\n\nDe aanbevolen 
beveiligingsinstellingen voor %S zijn ingesteld.\n\nU kunt nu de andere 
instellingen handmatig configureren.
+
+torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy NIET wordt aangeraden.\n\nGa hier alleen 
mee verder als u weet wat u doet.
+torbirdy.email.advanced.nextwarning=Gelieve deze waarschuwing volgende keer te 
tonen
+torbirdy.email.advanced.title=TorBirdy Uitgebreide Instellingen
+
+torbirdy.firstrun=U gebruikt nu TorBirdy.\n\nOm uw anonimiteit te beschermen 
zal TorBirdy de Thunderbird-instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door u of door add-ons. Er zijn sommige instellingen 
die aangepast kunnen worden; deze zijn beschikbaar in het voorkeurenvenster van 
TorBirdy. Wanneer TorBirdy verwijderd wordt, worden alle instellingen die 
aangepast zijn weer teruggezet naar hun standaardwaarden (de waarden die 
gebruikt werden voor de installatie van TorBirdy).\n\nAls u een nieuwe 
gebruiker bent, raden we u aan om de TorBirdy website te lezen om te begrijpen 
wat we met TorBirdy voor onze gebruikers proberen te bereiken.
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-privdtd_completed] Update translations for tor-messenger-privdtd_completed

[translation]

commit 3c5e6dbf9688b5bd335893d525279f73c68ed09e
Author: Translation commit bot 
Date:   Thu Oct 26 12:20:30 2017 +

Update translations for tor-messenger-privdtd_completed
---
 nl_BE/priv.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nl_BE/priv.dtd b/nl_BE/priv.dtd
new file mode 100644
index 0..710e47a7a
--- /dev/null
+++ b/nl_BE/priv.dtd
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd

[translation]

commit 40afdcfcbd877e38986c9158aeb322dcf59d72ea
Author: Translation commit bot 
Date:   Thu Oct 26 12:20:25 2017 +

Update translations for tor-messenger-privdtd
---
 nl_BE/priv.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl_BE/priv.dtd b/nl_BE/priv.dtd
index 2f3415614..710e47a7a 100644
--- a/nl_BE/priv.dtd
+++ b/nl_BE/priv.dtd
@@ -1,2 +1,2 @@
-
+
 
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

[translation]

commit 95de4f1d7dc3f3726481f206dc3d39afa89b1c99
Author: Translation commit bot 
Date:   Thu Oct 26 12:19:23 2017 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 nl_BE/abouttbupdate.dtd | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/nl_BE/abouttbupdate.dtd b/nl_BE/abouttbupdate.dtd
new file mode 100644
index 0..d6d4ce475
--- /dev/null
+++ b/nl_BE/abouttbupdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

[translation]

commit 433cefc4c0237de290160bed9c4f176af9125564
Author: Translation commit bot 
Date:   Thu Oct 26 12:19:18 2017 +

Update translations for torbutton-abouttbupdatedtd
---
 nl_BE/abouttbupdate.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl_BE/abouttbupdate.dtd b/nl_BE/abouttbupdate.dtd
index 37567bd7e..d6d4ce475 100644
--- a/nl_BE/abouttbupdate.dtd
+++ b/nl_BE/abouttbupdate.dtd
@@ -1,6 +1,6 @@
 
-
-
-
+
+
+
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

[translation]

commit 862d2e3231cdc47834a0069a5f051972c2027eff
Author: Translation commit bot 
Date:   Thu Oct 26 12:18:26 2017 +

Update translations for tails-perl5lib_completed
---
 nl_BE.po | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nl_BE.po b/nl_BE.po
index bf37602af..2e2aedc30 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Joren Vandeweyer , 2017
 # Katrien Igodt , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-05-02 21:08+0200\n"
-"PO-Revision-Date: 2015-08-09 14:20+\n"
-"Last-Translator: Katrien Igodt \n"
+"POT-Creation-Date: 2017-05-20 10:59+0200\n"
+"PO-Revision-Date: 2017-10-26 11:49+\n"
+"Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (Belgium) 
(http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,8 +19,18 @@ msgstr ""
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/RunningSystem.pm:153
+#: ../lib/Tails/RunningSystem.pm:159
+msgid "Error"
+msgstr "Foutmelding:"
+
+#: ../lib/Tails/RunningSystem.pm:161
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the `toram'"
 " option?"
 msgstr "Het apparaat waarop Tails uitgevoerd wordt, kan niet gevonden worden. 
Misschien heeft u de `toram' optie gebruikt."
+
+#: ../lib/Tails/RunningSystem.pm:192
+msgid ""
+"The drive Tails is running from cannot be found. Maybe you used the `toram' "
+"option?"
+msgstr "Het schijfstation waarvan Tails is opgestart kan niet worden gevonden. 
Misschien heeft u de optie 'toram' gebruikt?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

[translation]

commit d11db1eea2eeacb3cc104f00d059f56f6ce03548
Author: Translation commit bot 
Date:   Thu Oct 26 12:18:20 2017 +

Update translations for tails-perl5lib
---
 nl_BE.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nl_BE.po b/nl_BE.po
index 54674f280..2e2aedc30 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Joren Vandeweyer , 2017
 # Katrien Igodt , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-09-19 23:00+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-10-26 11:49+\n"
+"Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (Belgium) 
(http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,4 +33,4 @@ msgstr "Het apparaat waarop Tails uitgevoerd wordt, kan niet 
gevonden worden. Mi
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the `toram' "
 "option?"
-msgstr ""
+msgstr "Het schijfstation waarvan Tails is opgestart kan niet worden gevonden. 
Misschien heeft u de optie 'toram' gebruikt?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbirdy] Update translations for torbirdy

[translation]

commit 301194b4be9ef1479bbab80803f936f4800e
Author: Translation commit bot 
Date:   Thu Oct 26 12:16:26 2017 +

Update translations for torbirdy
---
 nl/torbirdy.dtd   | 2 +-
 nl_BE/torbirdy.dtd| 2 +-
 nl_BE/torbirdy.properties | 8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd
index d13131400..bfbec31c9 100644
--- a/nl/torbirdy.dtd
+++ b/nl/torbirdy.dtd
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
diff --git a/nl_BE/torbirdy.dtd b/nl_BE/torbirdy.dtd
index be11ba2d8..01831dd34 100644
--- a/nl_BE/torbirdy.dtd
+++ b/nl_BE/torbirdy.dtd
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 
diff --git a/nl_BE/torbirdy.properties b/nl_BE/torbirdy.properties
index a438a4568..51a5e6d25 100644
--- a/nl_BE/torbirdy.properties
+++ b/nl_BE/torbirdy.properties
@@ -6,13 +6,13 @@ torbirdy.enabled.custom=TorBirdy Ingeschakeld : Aangepaste 
Proxy
 torbirdy.enabled.torification=TorBirdy Ingeschakeld : Transparante Torificatie
 torbirdy.enabled.whonix=TorBirdy Ingeschakeld: Whonix
 torbirdy.disabled=TorBirdy: Uitgeschakeld!
-torbirdy.enabled=TorBirdy:Enabled
+torbirdy.enabled=TorBirdy: Ingeschakeld
 
-torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration 
wizard to protect your anonymity.\n\nThe recommended security settings for %S 
have been set.\n\nYou can now configure the other account settings manually.
+torbirdy.email.prompt=TorBirdy heeft de automatische configuratiehulp van 
Thunderbird uitgeschakeld om uw anonimiteit te beschermen.\n\nDe aanbevolen 
beveiligingsinstellingen voor %S zijn ingesteld.\n\nU kunt nu de andere 
instellingen handmatig configureren.
 
-torbirdy.email.advanced=Please note that changing the advanced settings of 
TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of 
what you are doing.
+torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy NIET wordt aangeraden.\n\nGa hier alleen 
mee verder als u weet wat u doet.
 torbirdy.email.advanced.nextwarning=Gelieve deze waarschuwing volgende keer te 
tonen
 torbirdy.email.advanced.title=TorBirdy Uitgebreide Instellingen
 
-torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your 
anonymity, TorBirdy will enforce the Thunderbird settings it has set, 
preventing them from being changed by you or by any add-on. There are some 
settings that can be changed and those are accessed through TorBirdy's 
preferences dialog. When TorBirdy is uninstalled or disabled, all settings that 
it changes are reset to their default values (the values prior to TorBirdy's 
install).\n\nIf you are a new user, it is recommended that you read through the 
TorBirdy website to understand what we are trying to accomplish with TorBirdy 
for our users.
+torbirdy.firstrun=U gebruikt nu TorBirdy.\n\nOm uw anonimiteit te beschermen 
zal TorBirdy de Thunderbird-instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door u of door add-ons. Er zijn sommige instellingen 
die aangepast kunnen worden; deze zijn beschikbaar in het voorkeurenvenster van 
TorBirdy. Wanneer TorBirdy verwijderd wordt, worden alle instellingen die 
aangepast zijn weer teruggezet naar hun standaardwaarden (de waarden die 
gebruikt werden voor de installatie van TorBirdy).\n\nAls u een nieuwe 
gebruiker bent, raden we u aan om de TorBirdy website te lezen om te begrijpen 
wat we met TorBirdy voor onze gebruikers proberen te bereiken.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torcheck] Update translations for torcheck

[translation]

commit 193c8b6b7513e652805c83ff11f7c0fe75208466
Author: Translation commit bot 
Date:   Thu Oct 26 12:15:17 2017 +

Update translations for torcheck
---
 nl_BE/torcheck.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nl_BE/torcheck.po b/nl_BE/torcheck.po
index 5a2713636..4fb057551 100644
--- a/nl_BE/torcheck.po
+++ b/nl_BE/torcheck.po
@@ -3,12 +3,13 @@
 # 
 # Translators:
 # Cleveridge , 2014
+# Joren Vandeweyer , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 23:00+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2017-10-26 11:58+\n"
+"Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (Belgium) 
(http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgid ""
 msgstr "Raadpleeg de https://www.torproject.org/\;>Tor-website 
voor meer informatie over hoe u Tor veilig kunt gebruiken.U kunt nu anoniem op 
het internet surfen."
 
 msgid "There is a security update available for Tor Browser."
-msgstr ""
+msgstr "Er is een beveiligingsupdate beschikbaar voor de Tor Browser Bundle."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -94,10 +95,10 @@ msgid "JavaScript is disabled."
 msgstr "JavaScript is uitgeschakeld"
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr ""
+msgstr "Hoewel, dit lijkt niet de Tor Browser te zijn."
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "Beheer een Relay"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "Blijf Anoniem"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

[translation]

commit 7a0938b7b7bef9762dfe96386784e16ea0e5b6f2
Author: Translation commit bot 
Date:   Thu Oct 26 11:18:48 2017 +

Update translations for torbutton-abouttorproperties
---
 ca/abouttor.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ca/abouttor.properties b/ca/abouttor.properties
index 0ff4615ab..169ac01c9 100644
--- a/ca/abouttor.properties
+++ b/ca/abouttor.properties
@@ -13,8 +13,8 @@ aboutTor.donationBanner.donate=Fes una donació ara!
 aboutTor.donationBanner.slogan=Tor: Potenciant la resistència digital
 aboutTor.donationBanner.mozilla=Dona avui i Mozilla us recompensarà!
 
-aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & 
Activists Since 2006
-aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
-aboutTor.donationBanner.tagline3=Freedom Online
-aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
+aboutTor.donationBanner.tagline1=Protegint periodistes, denunciants i 
activistes des de 2006
+aboutTor.donationBanner.tagline2=Interconectant llibertat global
+aboutTor.donationBanner.tagline3=Llibertat online
+aboutTor.donationBanner.tagline4=Fomentant la lliure expresió global
 aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de 
persones cada dia

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

[translation]

commit 5dac7e7cc9516ea05d2f9c7c2453abf59142b1d9
Author: Translation commit bot 
Date:   Thu Oct 26 11:18:54 2017 +

Update translations for torbutton-abouttorproperties_completed
---
 ca/abouttor.properties | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/ca/abouttor.properties b/ca/abouttor.properties
index e348d7970..169ac01c9 100644
--- a/ca/abouttor.properties
+++ b/ca/abouttor.properties
@@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Cerca de forma 
segura amb https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Fes una donació ara!
+
+aboutTor.donationBanner.slogan=Tor: Potenciant la resistència digital
+aboutTor.donationBanner.mozilla=Dona avui i Mozilla us recompensarà!
+
+aboutTor.donationBanner.tagline1=Protegint periodistes, denunciants i 
activistes des de 2006
+aboutTor.donationBanner.tagline2=Interconectant llibertat global
+aboutTor.donationBanner.tagline3=Llibertat online
+aboutTor.donationBanner.tagline4=Fomentant la lliure expresió global
+aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de 
persones cada dia

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

[translation]

commit acd7f6c3c442f594c924d3f0610268064782039a
Author: Translation commit bot 
Date:   Thu Oct 26 11:16:05 2017 +

Update translations for liveusb-creator_completed
---
 nl/nl.po   |  10 +-
 nl_BE/nl_BE.po | 511 +
 2 files changed, 516 insertions(+), 5 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index f49707999..446630668 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-25 14:02+0200\n"
-"PO-Revision-Date: 2017-10-20 16:21+\n"
+"PO-Revision-Date: 2017-10-26 11:08+\n"
 "Last-Translator: Joren Vandeweyer \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -227,7 +227,7 @@ msgstr "%(device)s als FAT32 formatteren"
 
 #: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
-msgstr "Kon syslinx' gptmbr.bin niet vinden"
+msgstr "Kon syslinux' gptmbr.bin niet vinden"
 
 #: ../tails_installer/creator.py:1279
 #, python-format
@@ -347,7 +347,7 @@ msgstr "Geen ISO image geselecteerd"
 
 #: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
-msgstr "Selecteerd een Tails ISO image"
+msgstr "Selecteer een Tails ISO image"
 
 #: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
@@ -470,7 +470,7 @@ msgid ""
 "There was a problem executing `%s`.\n"
 "%s\n"
 "%s"
-msgstr "Er was een probleem bij het uitvoeren van ' %s'.%s\n%s"
+msgstr "Er was een probleem bij het uitvoeren van ` %s`.\n%s\n%s"
 
 #: ../tails_installer/source.py:63
 #, python-format
@@ -492,7 +492,7 @@ msgstr "'%(filename)s' wordt overgeslagen"
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
-msgstr "Er was een probleem bij het uitvoeren van ' %s'.%s\n%s"
+msgstr "Er was een probleem bij het uitvoeren van ` %s`.%s\n%s"
 
 #: ../tails_installer/utils.py:124
 msgid "Could not open device for writing."
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
new file mode 100644
index 0..429adf5d4
--- /dev/null
+++ b/nl_BE/nl_BE.po
@@ -0,0 +1,511 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Joren Vandeweyer , 2017
+# Katrien Igodt , 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-25 14:02+0200\n"
+"PO-Revision-Date: 2017-10-26 11:10+\n"
+"Last-Translator: Joren Vandeweyer \n"
+"Language-Team: Dutch (Belgium) 
(http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl_BE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../tails_installer/creator.py:101
+msgid "You must run this application as root"
+msgstr "U dient deze applicatie als root uit te voeren"
+
+#: ../tails_installer/creator.py:147
+msgid "Extracting live image to the target device..."
+msgstr "Live afbeelding naar het doelapparaat overzetten..."
+
+#: ../tails_installer/creator.py:154
+#, python-format
+msgid "Wrote to device at %(speed)d MB/sec"
+msgstr "Schreef naar apparaat met %(speed)d MB/sec"
+
+#: ../tails_installer/creator.py:184
+msgid "Setting up OLPC boot file..."
+msgstr "OPLC boot file aan het opmaken..."
+
+#: ../tails_installer/creator.py:321
+#, python-format
+msgid ""
+"There was a problem executing the following command: `%(command)s`.\n"
+"A more detailed error log has been written to '%(filename)s'."
+msgstr "Er deed zich een probleem voor bij het uitvoeren van volgende opdracht 
: `%(command)s`.\nEen meer gedetailleerd foutrapport werd weggeschreven naar 
'%(filename)s'."
+
+#: ../tails_installer/creator.py:340
+msgid "Verifying SHA1 checksum of LiveCD image..."
+msgstr "SHA1 checksum van de LiveCD image aan het verifiëren..."
+
+#: ../tails_installer/creator.py:344
+msgid "Verifying SHA256 checksum of LiveCD image..."
+msgstr "SHA256 checksum van de LiveCD image aan het verifiëren..."
+
+#: ../tails_installer/creator.py:360
+msgid ""
+"Error: The SHA1 of your Live CD is invalid.  You can run this program with "
+"the --noverify argument to bypass this verification check."
+msgstr "Fout: De SHA1 van uw Live CD is niet correct. U kunt dit programma 
uitvoeren met het --noverify argument om deze controle over te slaan."
+
+#: ../tails_installer/creator.py:366
+msgid "Unknown ISO, skipping checksum verification"
+msgstr "Onbekende ISO, checksum verificatie overslaan"
+
+#: ../tails_installer/creator.py:377
+#, python-format
+msgid ""
+"Not enough free space on device.\n"
+"%dMB ISO + %dMB overlay > %dMB free space"
+msgstr "Niet genoeg vrije ruimte op het apparaat.\n %dMB 

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

[translation]

commit 0175ddb3f44402ae71d806c45e4ace6b011b505e
Author: Translation commit bot 
Date:   Thu Oct 26 10:53:01 2017 +

Update translations for tor-browser-manual_completed
---
 nl/nl.po | 1845 ++
 1 file changed, 1845 insertions(+)

diff --git a/nl/nl.po b/nl/nl.po
new file mode 100644
index 0..f76ba796f
--- /dev/null
+++ b/nl/nl.po
@@ -0,0 +1,1845 @@
+# Translators:
+# Joren Vandeweyer , 2016
+# Nathan Follens , 2016
+# Shondoit Walker , 2016
+# enc , 2016
+# runasand , 2016
+# Stijn , 2016
+# kwadronaut , 2016
+# André Koot , 2016
+# Wim , 2017
+# Stefan Roukens , 2017
+# Thomas van Voorst , 2017
+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: Thomas van Voorst , 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Put one translator per line, in the form NAME , YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"André Koot\n"
+"Nathan Follens\n"
+"Joren Vandeweyer"
+
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr ""
+"Lees meer over hoe de Tor Browser je kan helpen je privacy en anonimiteit te"
+" beschermen"
+
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
+msgstr "Over Tor Browser"
+
+#: about-tor-browser.page:12
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr ""
+"Torbrowser gebruikt het Tornetwerk om je privacy en anonimiteit te "
+"beschermen. De Torbrowser gebruiken heeft twee belangrijke eigenschappen:"
+
+#: about-tor-browser.page:18
+msgid ""
+"Your internet service provider, and anyone watching your connection locally,"
+" will not be able to track your internet activity, including the names and "
+"addresses of the websites you visit."
+msgstr ""
+"Je internet provider en andere die lokaal je netwerk in de gaten houden "
+"kunnen niet je internet activiteit zien. Dit geld ook voor namen en adressen"
+" van webpagina's die je bezoekt."
+
+#: about-tor-browser.page:25
+msgid ""
+"The operators of the websites and services that you use, and anyone watching"
+" them, will see a connection coming from the Tor network instead of your "
+"real Internet (IP) address, and will not know who you are unless you "
+"explicitly identify yourself."
+msgstr ""
+"De beheerders van de websites en services die je gebruikt, en iedereen die "
+"deze monitort, zullen een connectie vanuit het Tor netwerk zien in plaats "
+"van je echte IP adres. Zij kunnen niet weten wie je bent tenzei je dit zelf "
+"expliciet zegt."
+
+#: about-tor-browser.page:34
+msgid ""
+"In addition, Tor Browser is designed to prevent websites from "
+"“fingerprinting” or identifying you based on your browser configuration."
+msgstr ""
+"Daarnaast is de Tor Browser ontworpen om te voorkomen dat websites je "
+"\"vingerafdruk\" kunnen nemen of je identificeren aan de hand van je "
+"browserconfiguratie."
+
+#: about-tor-browser.page:39
+msgid ""
+"By default, Tor Browser does not keep any browsing history. Cookies are only"
+" valid for a single session (until Tor Browser is exited or a New Identity is requested)."
+msgstr ""
+"Standaard houdt de Tor Browser je surfgeschiedenis niet bij. Cookies zijn "
+"enkel geldig voor de huidige sessie (tot de Tor Browser gesloten wordt of "
+"Nieuwe Identieit "
+"wordt aangevraagd)"
+
+#: about-tor-browser.page:50
+msgid "How Tor works"
+msgstr "Hoe Tor werkt"
+
+#: about-tor-browser.page:52
+msgid ""
+"Tor is a network of virtual tunnels that allows you to improve your privacy "
+"and security on the Internet. Tor works by sending your traffic through "
+"three random servers (also known as relays) in the Tor network. The"
+" last relay in the circuit (the “exit relay”) then sends the traffic out "
+"onto the public Internet."
+msgstr ""
+"Tor is een netwerk van virtuele tunnels die het mogelijk maakt om je privacy"
+" en veiligheid op het internet te verbeteren. Tor werkt door je verkeer "
+"langs drie willekeurige servers (ook relays genaamd) te versturen "
+"in het Tor netwerk. De laatste relay in het lijstje (de \"exit relay\") "
+"stuurt dan je verkeer naar het publieke Internet."
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will 

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit 2619ceae671d48128dea0922a4ae26bd03b9df08
Author: Translation commit bot 
Date:   Thu Oct 26 10:52:40 2017 +

Update translations for tor-browser-manual
---
 nl/nl.po | 36 
 1 file changed, 36 insertions(+)

diff --git a/nl/nl.po b/nl/nl.po
index e3294970a..f76ba796f 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -806,6 +806,11 @@ msgid ""
 " be served over two different Tor circuits, so the tracker will not know "
 "that both connections originate from your browser."
 msgstr ""
+"Tor Browser centreert uw web ervaring rond u relatie met de website in de "
+"URL balk. Zelfs wanneer u verbind met verschillende sites die de zelfde "
+"third-party tracking service gebruiken, Tor Browser forceert dat deze inhoud"
+" wordt verstuurd over twee verschillende Tor circuits, zo dat deze tracker "
+"niet zal weten dat beide verbindingen afkomstig zijn van uw browser."
 
 #: managing-identities.page:38
 msgid ""
@@ -1236,6 +1241,13 @@ msgid ""
 " verify this in the URL bar: if your connection is encrypted, the address "
 "will begin with “https://”, rather than “http://”.;
 msgstr ""
+"Als persoonlijke informatie zoals wachtwoorden ongecodeerd over het internet"
+" verstuurd worden, kan dit gemakkelijk onderschept worden door een "
+"afluisteraar. Als u inlogt op eender welke website, moet u zeker maken dat "
+"deze website HTTPS encryptie ondersteund, die beschermt tegen dit soort van "
+"afluisteraars. U kunt dit verifiëren in de URL balk: als uw connectie is "
+"versleuteld, het adres zal dan beginnen met \"https://\;, in plaats van "
+"\"http://\".;
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1336,6 +1348,12 @@ msgid ""
 "some web pages from functioning properly, so you should weigh your security "
 "needs against the degree of usability you require."
 msgstr ""
+"Tor Browser bevat een \"Security Slider\" die u de veiligheid laat toenemen "
+"door enkele web features uit te schakelen die gebruikt kunnen worden om uw "
+"veiligheid en anonimiteit aan te vallen. Het laten toenemen van Tor Browser'"
+" veiligheidslevel zal sommige pagina's verhinderen correct te functioneren, "
+"dus u zult veiligheid moeten afwegen toegen de graad van bruikbaarheid die u"
+" vereist."
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
@@ -1401,6 +1419,13 @@ msgid ""
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
+"Op dit level, HTML5 video en audio bekomen click-to-play via NoScript; alle "
+"JavaScript prestatie optimalisaties zijn uitgeschakeld sommige wiskundige "
+"uitdrukkingen worden niet correct weergeven; sommige font rendering features"
+" zijn uitgeschakeld; sommige types van afbeeldingen zijn uitgeschakeld; "
+"JavaScript is standaard uitgeschakeld op alle websites; meeste video en "
+"audio formats zijn uitgeschakeld; en sommige fonts en iconen worden niet "
+"correct weergeven."
 
 #: security-slider.page:53
 msgid "Medium-High"
@@ -1415,6 +1440,12 @@ msgid ""
 "disabled by default on all non-HTTPS sites."
 msgstr ""
+"Op dit level, HTML5 video en audio bekomen click-to-play via NoScript; alle "
+"JavaScript prestatie optimalisaties zijn uitgeschakeld; sommige wiskunde "
+"uitdrukkingen worden niet correct weergeven; sommige font rendering features"
+" zijn uitgeschakeld; sommige types van afbeeldingen zijnuitgeschakeld; en "
+"JavaScript is standaard uitgeschakeld op alle niet-HTTPS websites."
 
 #: security-slider.page:64
 msgid "Medium-Low"
@@ -1427,6 +1458,11 @@ msgid ""
 "optimizations are disabled, causing some websites to run more slowly; and "
 "some mathematical equations may not display properly."
 msgstr ""
+"Op dit level, HTML5 video en audio bekomen click-to-play via NoScript; "
+"sommige JavaScript prestatie optimalisaties "
+"zijn uitgeschakeld, dit veroorzaakt dat sommige websites trager zullen "
+"werken; en dat sommige wiskundige uitdrukkingen niet correct weergeven "
+"worden."
 
 #: security-slider.page:73
 msgid "Low"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

[translation]

commit 877b4baf51aab3e39974e29b35d5593846c8f86d
Author: Translation commit bot 
Date:   Thu Oct 26 10:45:57 2017 +

Update translations for liveusb-creator
---
 ca/ca.po | 53 +++--
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/ca/ca.po b/ca/ca.po
index 84cb1d953..b823946c8 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -5,7 +5,7 @@
 # Translators:
 # Albert , 2013
 # Aleix Vidal i Gaya , 2014
-# dartmalak , 2014
+# dartmalak , 2014
 # Ari Romero , 2017
 # David Anglada , 2014
 # F Xavier Castane , 2013
@@ -13,14 +13,15 @@
 # josep constantí mata , 2015
 # laia_, 2015-2016
 # Pau Sellés i Garcia , 2013
+# Vte A.F , 2017
 # F Xavier Castane , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-25 14:02+0200\n"
-"PO-Revision-Date: 2017-10-01 06:08+\n"
-"Last-Translator: Ari Romero \n"
+"PO-Revision-Date: 2017-10-26 10:44+\n"
+"Last-Translator: Vte A.F \n"
 "Language-Team: Catalan 
(http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,7 +136,7 @@ msgstr "El sistema de fitxers de %s no està suportat."
 #: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr ""
+msgstr "Error desconegut de GLib mentre s'intentava montar: %(message)s"
 
 #: ../tails_installer/creator.py:792
 #, python-format
@@ -201,7 +202,7 @@ msgstr "Instal·lant el carregador de l'arrencada… "
 #: ../tails_installer/creator.py:1043
 #, python-format
 msgid "Could not find the '%s' COM32 module"
-msgstr ""
+msgstr "No s'ha pogut trobar el mòdul COM32 '%s'"
 
 #: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432
 #, python-format
@@ -224,17 +225,17 @@ msgstr "Formatant %(device)s a FAT32"
 
 #: ../tails_installer/creator.py:1266
 msgid "Could not find syslinux' gptmbr.bin"
-msgstr ""
+msgstr "No s'ha pogut trobar syslinux' gptmbr.bin"
 
 #: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
-msgstr ""
+msgstr "Llegint el MBR extret de %s"
 
 #: ../tails_installer/creator.py:1283
 #, python-format
 msgid "Could not read the extracted MBR from %(path)s"
-msgstr ""
+msgstr "No s'ha pogut llegir el MBR extret de %(path)s"
 
 #: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297
 #, python-format
@@ -312,7 +313,7 @@ msgstr "Instal·lació complerta! (%s)"
 
 #: ../tails_installer/gui.py:263
 msgid "Tails installation failed!"
-msgstr ""
+msgstr "L'instal·lació de Tails ha fracassat!"
 
 #: ../tails_installer/gui.py:363
 msgid ""
@@ -323,7 +324,7 @@ msgstr "Atenció: Aquesta eina necessita ser executada com 
Administrador. Per fe
 
 #: ../tails_installer/gui.py:375
 msgid "Tails Installer"
-msgstr ""
+msgstr "Instalador de Tails"
 
 #: ../tails_installer/gui.py:454
 msgid "Upgrade"
@@ -344,16 +345,16 @@ msgstr "No hi ha imatge d' ISO seleccionada"
 
 #: ../tails_installer/gui.py:477
 msgid "Please select a Tails ISO image."
-msgstr ""
+msgstr "Per favor, seleccioneu una imatge d' ISO de Tails."
 
 #: ../tails_installer/gui.py:516
 msgid "No device suitable to install Tails could be found"
-msgstr ""
+msgstr "No s'ha pogut trobar un dispositiu compatible per a instalar Tails."
 
 #: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
-msgstr ""
+msgstr "Per favor, connecteu una memòria USB o una targeta SD d'almenys %0.1f 
GB."
 
 #: ../tails_installer/gui.py:552
 #, python-format
@@ -361,7 +362,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr ""
+msgstr "La memòria USB \"%(pretty_name)s\" està configurada com a no 
extraíble pel propi fabricant i Tails no podrà executarse. Per favor, 
intenteu instalar-lo en un model diferent."
 
 #: ../tails_installer/gui.py:562
 #, python-format
@@ -372,7 +373,7 @@ msgstr "El dispositiu \"%(pretty_name)s\" és massa petit 
per instal·lar-hi el
 
 #: ../tails_installer/gui.py:584
 msgid "An error happened while installing Tails"
-msgstr ""
+msgstr "Ha ocorregut un error al instalar Tails."
 
 #: ../tails_installer/gui.py:596
 msgid "Refreshing releases..."
@@ -421,7 +422,7 @@ msgstr "\n\nEs conservarà l'emmagatzematge persistent 
d'aquesta memòria USB."
 #: ../tails_installer/gui.py:726
 #, python-format
 msgid "%(description)s%(persistence_message)s"

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit 2cb05802cb5442b5706508f4b51ba21aa5401a76
Author: Translation commit bot 
Date:   Thu Oct 26 10:22:26 2017 +

Update translations for tor-browser-manual
---
 nl/nl.po | 39 ++-
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index 60828a07c..e3294970a 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1199,6 +1199,9 @@ msgid ""
 "Tor Browser is based on Firefox, and any browser add-ons or themes that are "
 "compatible with Firefox can also be installed in Tor Browser."
 msgstr ""
+"Tor Browser is gebaseerd op FireFox, en elke browser add-ons of thema's die "
+"compatibel zijn met Firefox kunnen dus ook geïnstalleerd worden in Tor "
+"Browser."
 
 #: plugins.page:64
 msgid ""
@@ -1208,10 +1211,17 @@ msgid ""
 " privacy and security. It is strongly discouraged to install additional add-"
 "ons, and the Tor Project will not offer support for these configurations."
 msgstr ""
+"Echter, de enige add-ons die getest zijn door ons om te gebruiken met Tor "
+"Browser zijn deze die standaard zijn bijgevoegd. Het installeren van enige "
+"andere browser add-ons kan de functionaliteit van Tor Browser breken of meer"
+" ernstige problemen die uw privacy en veiligheid kunnen schaden. Het is ten "
+"zeerste afgeraden om extra add-ons te installeren, en het Tor Project zal "
+"geen ondersteuning bieden bij deze configuraties."
 
 #: secure-connections.page:8
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
 msgstr ""
+"Leer hoe u uw data kan beveiligen door Tor Browser en HTTPS te gebruiken"
 
 #: secure-connections.page:12
 msgid "Secure Connections"
@@ -1245,30 +1255,42 @@ msgid ""
 "The following visualization shows what information is visible to "
 "eavesdroppers with and without Tor Browser and HTTPS encryption:"
 msgstr ""
+"De volgende visualiseren laat zien welke informatie zichtbaar is aan "
+"afluisteraars met en zonder Tor Browser en HTTPS encryptie:"
 
 #: secure-connections.page:35
 msgid ""
 "Click the “Tor” button to see what data is visible to observers when 
you're "
 "using Tor. The button will turn green to indicate that Tor is on."
 msgstr ""
+"Klik die \"Tor\" knop om te zien welke data zichtbaar is aan waarnemers "
+"wanneer u Tor gebruikt. De knop zal groen kleuren om aan te geven dat Tor "
+"actief is."
 
 #: secure-connections.page:42
 msgid ""
 "Click the “HTTPS” button to see what data is visible to observers when "
 "you're using HTTPS. The button will turn green to indicate that HTTPS is on."
 msgstr ""
+"Klik de \"HTTPS\" knop om te zien welke data zichtbaar is aan waarnemers "
+"wanneer u HTTPS gebruikt. De knop zal rood kleuren om aan te geven dat HTTPS"
+" actief is."
 
 #: secure-connections.page:49
 msgid ""
 "When both buttons are green, you see the data that is visible to observers "
 "when you are using both tools."
 msgstr ""
+"Wanneer buide knoppen groen zijn, ziet u de data die zichtbaar is aan "
+"waarnemers wanneer u beide tools gebruikt."
 
 #: secure-connections.page:55
 msgid ""
 "When both buttons are grey, you see the data that is visible to observers "
 "when you don't use either tool."
 msgstr ""
+"Wanneer beide knoppen grijs zijn, ziet u de data die zichtbaar is aan "
+"waarnemers wanneer u geen enkele tool gebruikt."
 
 #: secure-connections.page:62
 msgid "Potentially visible data"
@@ -1284,25 +1306,27 @@ msgstr "Gebruikersnaam en wachtwoord gebruikt voor 
authenticatie."
 
 #: secure-connections.page:92
 msgid "Data being transmitted."
-msgstr ""
+msgstr "Gegevens die worden verzonden."
 
 #: secure-connections.page:103
 msgid ""
 "Network location of the computer used to visit the website (the public IP "
 "address)."
 msgstr ""
+"Netwerk locatie van de computer gebruikt om de website te bezoeken (het "
+"publieke IP adres)."
 
 #: secure-connections.page:115
 msgid "Whether or not Tor is being used."
-msgstr ""
+msgstr "Of Tor gebruikt wordt of niet."
 
 #: security-slider.page:6
 msgid "Configuring Tor Browser for security and usability"
-msgstr ""
+msgstr "Tor Browser instellen voor veiligheid en gebruikbaarheid"
 
 #: security-slider.page:10
 msgid "Security Slider"
-msgstr ""
+msgstr "Security Slider"
 
 #: security-slider.page:11
 msgid ""
@@ -1315,7 +1339,7 @@ msgstr ""
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
-msgstr ""
+msgstr "Toegang tot de Security Slider"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1335,6 +1359,8 @@ msgid ""
 "The Security Slider is located in Torbutton’s “Privacy and Security "
 "Settings” menu."
 msgstr ""
+"De Security Slider kan gevonden worden in Torbutton's \"Privacy- en "
+"Veiligheidsinstellingen\" menu."
 
 #: security-slider.page:32
 msgid "Security Levels"
@@ -1358,6 +1384,9 @@ msgid ""
 "Increasing the level of the Security Slider will disable or 

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit 03928362b00adf7b0b18b5d685b0d5a35cc1562f
Author: Translation commit bot 
Date:   Thu Oct 26 09:50:57 2017 +

Update translations for tor-browser-manual
---
 nl/nl.po | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/nl/nl.po b/nl/nl.po
index 77f080e8b..60828a07c 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1182,6 +1182,13 @@ msgid ""
 " many websites from displaying correctly, so Tor Browser’s default setting "
 "is to allow all websites to run scripts."
 msgstr ""
+"Gebruikers die een hoog niveau van veiligheid vereisen in hun web browser "
+"zouden hun Veiligheids slider in de "
+"Tor Browser naar \"Medium-High\" moeten zetten (deze deactiveerd JavaScript "
+"voor niet-HTTPS websites) of \"High\" (deze dit voor alle websites). Echter,"
+" JavaScript uitschakelen zal ervoor zorgen dat veel websites onnauwkeurig "
+"weer gegeven worden, dus Tor Browser's standaard instelling is dat websites "
+"toegestaan zijn om scripts uit te voeren."
 
 #: plugins.page:58
 msgid "Browser Add-ons"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Update to latest metrics-lib.

[karsten]

commit bef3f443b61f286f008a02a614428203ba4fbe60
Author: Karsten Loesing 
Date:   Thu Oct 26 10:52:49 2017 +0200

Update to latest metrics-lib.
---
 submods/metrics-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submods/metrics-lib b/submods/metrics-lib
index 6b8de66..663bdc2 16
--- a/submods/metrics-lib
+++ b/submods/metrics-lib
@@ -1 +1 @@
-Subproject commit 6b8de66d171dd85d8244a7d326ca436ce68e0d78
+Subproject commit 663bdc285c4b5e0979691c44bf4790779df9bdf0

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-lib/master] Update to latest metrics-base.

[karsten]

commit 663bdc285c4b5e0979691c44bf4790779df9bdf0
Author: Karsten Loesing 
Date:   Thu Oct 26 10:51:39 2017 +0200

Update to latest metrics-base.
---
 src/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build b/src/build
index 78e533f..4b34756 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc
+Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit f991a5ea326c877aa674cb32bc7e2f0d962050b3
Author: Translation commit bot 
Date:   Thu Oct 26 08:50:56 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 9294e5580..52d598ded 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -8,12 +8,13 @@
 # Leya Hanna , 2016
 # ASSYASS Mahmoud , 2017
 # Jacob Leppek , 2017
+# mohammad ali , 2017
 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: Jacob Leppek , 2017\n"
+"Last-Translator: mohammad ali , 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -726,6 +727,11 @@ msgid ""
 "trackers, and advertising beacons, all of which can link your activity "
 "across different sites."
 msgstr ""
+"عندما تقوم باﻹتّصال بموقع وِبْ , ليس فقط 
القائمين على هذا الموقع هم من "
+"يقومون بتوثيق معلومات حول زيارتك, معظم م
واقع الوِبْ في الوقت الحالي تقوم "
+"باستخدام العديد من خدمات الطرف الثالث , بم
ا يشمل أزرار \" الاعجاب\" لمواقع "
+"التواصل الاجتماعية , المتعقّبات 
التحليليّة, واللوحات الاعلانية , والتي "
+"يمكنها جميعا ان تربط نشاطك بالمواقع الم
تعددة."
 
 #: managing-identities.page:20
 msgid ""
@@ -735,10 +741,14 @@ msgid ""
 " Browser includes some additional features that help you control what "
 "information can be tied to your identity."
 msgstr ""
+"استخدام شبكة Tor يمنع المتطفّلين من اكتشاف م
وقعك المحدد وعنوان شبكبتك الخاص,"
+" ولكن حتى بدون هذه المعلومات يمكنهم ربط ام
اكن مختلفة من نشاطك معا, لهذا "
+"السبب, يشمل متصفّح Tor بعض الخاصيّات التي 
تساعدك على التحكّم بالمعلومات التي"
+" يمكن ربطها بك."
 
 #: managing-identities.page:29
 msgid "The URL bar"
-msgstr ""
+msgstr "شريط العناوين"
 
 #: managing-identities.page:30
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Retain "bridge-distribution-request" lines.

[karsten]

commit e54bca3f9588c3253d9f244d10819f82399b4539
Author: Karsten Loesing 
Date:   Wed Oct 25 20:49:18 2017 +0200

Retain "bridge-distribution-request" lines.
---
 .../org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index 441eb01..12b42ac 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -946,7 +946,8 @@ public class SanitizedBridgesWriter extends CollecTorMain {
 || line.equals("opt allow-single-hop-exits")
 || line.equals("allow-single-hop-exits")
 || line.startsWith("ipv6-policy ")
-|| line.equals("tunnelled-dir-server")) {
+|| line.equals("tunnelled-dir-server")
+|| line.startsWith("bridge-distribution-request ")) {
   scrubbed.append(line + "\n");
 
 /* Replace node fingerprints in the family line with their hashes



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Handle bridge descriptors with unusual line order.

[karsten]

commit a38f7c277142e5300f3d7f43567b38706d727010
Author: Karsten Loesing 
Date:   Wed Oct 25 17:29:40 2017 +0200

Handle bridge descriptors with unusual line order.

Typically, the "published" line appears before the "fingerprint" line.
However, an alternative Tor implementation orders these two lines
differently, which is valid due to the spec. We need to handle this
case by accepting lines in either order.

Fixes #23981.
---
 .../bridgedescs/SanitizedBridgesWriter.java| 77 +-
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index f53a3d1..441eb01 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -679,6 +679,7 @@ public class SanitizedBridgesWriter extends CollecTorMain {
   new String(data, "US-ASCII")));
   StringBuilder scrubbed = new StringBuilder();
   String line = null;
+  byte[] fingerprintBytes = null;
   String hashedBridgeIdentity = null;
   String address = null;
   String routerLine = null;
@@ -734,6 +735,20 @@ public class SanitizedBridgesWriter extends CollecTorMain {
   this.haveWarnedAboutInterval = true;
 }
   }
+  if (null != fingerprintBytes) {
+/* We have read both published and fingerprint lines that we need 
to
+ * scrub the bridge's address which we might need to scrub reject
+ * lines. */
+try {
+  scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
+  published);
+} catch (IOException e) {
+  /* There's a persistence problem, so we shouldn't scrub more
+   * IP addresses in this execution. */
+  this.persistenceProblemWithSecrets = true;
+  return;
+}
+  }
   scrubbed.append(line + "\n");
 
 /* Parse the fingerprint to determine the hashed bridge
@@ -743,13 +758,51 @@ public class SanitizedBridgesWriter extends CollecTorMain 
{
   String fingerprint = line.substring(line.startsWith("opt ")
   ? "opt fingerprint".length() : "fingerprint".length())
   .replaceAll(" ", "").toLowerCase();
-  byte[] fingerprintBytes = Hex.decodeHex(
-  fingerprint.toCharArray());
+  fingerprintBytes = Hex.decodeHex(fingerprint.toCharArray());
   hashedBridgeIdentity = DigestUtils.sha1Hex(fingerprintBytes)
   .toLowerCase();
+  if (null != published) {
+/* We have read both published and fingerprint lines that we need 
to
+ * scrub the bridge's address which we might need to scrub reject
+ * lines. */
+try {
+  scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
+  published);
+} catch (IOException e) {
+  /* There's a persistence problem, so we shouldn't scrub more
+   * IP addresses in this execution. */
+  this.persistenceProblemWithSecrets = true;
+  return;
+}
+  }
+  scrubbed.append((line.startsWith("opt ") ? "opt " : "")
+  + "fingerprint");
+  for (int i = 0; i < hashedBridgeIdentity.length() / 4; i++) {
+scrubbed.append(" " + hashedBridgeIdentity.substring(4 * i,
+4 * (i + 1)).toUpperCase());
+  }
+  scrubbed.append("\n");
+
+/* Replace the contact line (if present) with a generic one. */
+} else if (line.startsWith("contact ")) {
+  scrubbed.append("contact somebody\n");
+
+/* When we reach the signature, we're done. Write the sanitized
+ * descriptor to disk below. */
+} else if (line.startsWith("router-signature")) {
+
+  /* Write the scrubbed "router" line now based on the "router",
+   * "fingerprint", and "published" lines that we read before. Also
+   * scrub any "or-address" lines. */
+  if (null == routerLine || null == fingerprintBytes
+  || null == published) {
+logger.warn("Missing either of the following lines that are "
++ "required to sanitize this server bridge descriptor: "
++ "\"router\", \"fingerprint\", \"published\". Skipping "
++ "descriptor.");
+return;
+  }
   try {
-scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
-published);
 if (orAddresses != null) {
   scrubbedOrAddresses = new ArrayList<>();
   for (String orAddress : orAddresses) {
@@ -781,21 +834,9 @@ 

[tor-commits] [collector/release] Add test that will fail #23981.

[karsten]

commit 3a95892de3bb4728a45812b2cc2ed9d24a7de33e
Author: Karsten Loesing 
Date:   Wed Oct 25 16:45:38 2017 +0200

Add test that will fail #23981.
---
 .../collector/bridgedescs/SanitizedBridgesWriterTest.java  | 14 ++
 1 file changed, 14 insertions(+)

diff --git 
a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
 
b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
index 0e62573..3afe9cb 100644
--- 
a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
+++ 
b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
@@ -440,6 +440,20 @@ public class SanitizedBridgesWriterTest {
   }
 
   @Test
+  public void testServerDescriptorPublishedLineAfterFingerprintLine()
+  throws Exception {
+this.configuration.setProperty(Key.ReplaceIpAddressesWithHashes.name(),
+"true");
+String fingerprintLine =
+"fingerprint 46D4 A711 97B8 FA51 5A82 6C6B 017C 522F E264 655B";
+this.defaultServerDescriptorBuilder.removeLine(fingerprintLine);
+this.defaultServerDescriptorBuilder.insertBeforeLineStartingWith(
+"published ", Arrays.asList(fingerprintLine));
+this.runTest();
+assertFalse(this.parsedServerDescriptors.isEmpty());
+  }
+
+  @Test
   public void testExtraInfoDescriptorDefault() throws Exception {
 this.runTest();
 List expectedLines = Arrays.asList(



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Bump version to 1.4.0-dev.

[karsten]

commit ebb13b12d0ae492ef7f30638c4aaea29cea3af45
Author: Karsten Loesing 
Date:   Tue Oct 17 21:22:04 2017 +0200

Bump version to 1.4.0-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 7cbff44..c4f4bd0 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   
   
-  
+  
   
   
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Bump version to 1.4.1-dev.

[karsten]

commit 60dfface9783b5715717dd10fbd90c4dc93e4321
Author: Karsten Loesing 
Date:   Thu Oct 26 10:16:35 2017 +0200

Bump version to 1.4.1-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index fb87709..f004f29 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   
   
-  
+  
   
   
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Prepare for 1.4.1 release.

[karsten]

commit 56a303ecdb9c7f12fe117731a5511667e9763d31
Author: Karsten Loesing 
Date:   Wed Oct 25 20:51:30 2017 +0200

Prepare for 1.4.1 release.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c4f4bd0..fb87709 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   
   
-  
+  
   
   
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Add change log entries for the two #23981 changes.

[karsten]

commit 7cfb69ad036052d0d62a2c64efcd01df8bcb5145
Author: Karsten Loesing 
Date:   Wed Oct 25 20:50:29 2017 +0200

Add change log entries for the two #23981 changes.
---
 CHANGELOG.md | 9 +
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b12b33b..c924f5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Changes in version 1.4.1 - 2017-10-26
+
+ * Medium changes
+   - Handle bridge descriptors with an unusual order of "published"
+ and "fingerprint" lines.
+   - Retain "bridge-distribution-request" lines when sanitizing
+ descriptors.
+
+
 # Changes in version 1.4.0 - 2017-10-09
 
  * Major changes



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/release] Update metrics-base.

[karsten]

commit 3a0ba1baba1e77780803a7ed0559be122a6f01b6
Author: Karsten Loesing 
Date:   Wed Oct 25 20:50:00 2017 +0200

Update metrics-base.
---
 src/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build b/src/build
index 78e533f..4b34756 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc
+Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Handle bridge descriptors with unusual line order.

[karsten]

commit a38f7c277142e5300f3d7f43567b38706d727010
Author: Karsten Loesing 
Date:   Wed Oct 25 17:29:40 2017 +0200

Handle bridge descriptors with unusual line order.

Typically, the "published" line appears before the "fingerprint" line.
However, an alternative Tor implementation orders these two lines
differently, which is valid due to the spec. We need to handle this
case by accepting lines in either order.

Fixes #23981.
---
 .../bridgedescs/SanitizedBridgesWriter.java| 77 +-
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index f53a3d1..441eb01 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -679,6 +679,7 @@ public class SanitizedBridgesWriter extends CollecTorMain {
   new String(data, "US-ASCII")));
   StringBuilder scrubbed = new StringBuilder();
   String line = null;
+  byte[] fingerprintBytes = null;
   String hashedBridgeIdentity = null;
   String address = null;
   String routerLine = null;
@@ -734,6 +735,20 @@ public class SanitizedBridgesWriter extends CollecTorMain {
   this.haveWarnedAboutInterval = true;
 }
   }
+  if (null != fingerprintBytes) {
+/* We have read both published and fingerprint lines that we need 
to
+ * scrub the bridge's address which we might need to scrub reject
+ * lines. */
+try {
+  scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
+  published);
+} catch (IOException e) {
+  /* There's a persistence problem, so we shouldn't scrub more
+   * IP addresses in this execution. */
+  this.persistenceProblemWithSecrets = true;
+  return;
+}
+  }
   scrubbed.append(line + "\n");
 
 /* Parse the fingerprint to determine the hashed bridge
@@ -743,13 +758,51 @@ public class SanitizedBridgesWriter extends CollecTorMain 
{
   String fingerprint = line.substring(line.startsWith("opt ")
   ? "opt fingerprint".length() : "fingerprint".length())
   .replaceAll(" ", "").toLowerCase();
-  byte[] fingerprintBytes = Hex.decodeHex(
-  fingerprint.toCharArray());
+  fingerprintBytes = Hex.decodeHex(fingerprint.toCharArray());
   hashedBridgeIdentity = DigestUtils.sha1Hex(fingerprintBytes)
   .toLowerCase();
+  if (null != published) {
+/* We have read both published and fingerprint lines that we need 
to
+ * scrub the bridge's address which we might need to scrub reject
+ * lines. */
+try {
+  scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
+  published);
+} catch (IOException e) {
+  /* There's a persistence problem, so we shouldn't scrub more
+   * IP addresses in this execution. */
+  this.persistenceProblemWithSecrets = true;
+  return;
+}
+  }
+  scrubbed.append((line.startsWith("opt ") ? "opt " : "")
+  + "fingerprint");
+  for (int i = 0; i < hashedBridgeIdentity.length() / 4; i++) {
+scrubbed.append(" " + hashedBridgeIdentity.substring(4 * i,
+4 * (i + 1)).toUpperCase());
+  }
+  scrubbed.append("\n");
+
+/* Replace the contact line (if present) with a generic one. */
+} else if (line.startsWith("contact ")) {
+  scrubbed.append("contact somebody\n");
+
+/* When we reach the signature, we're done. Write the sanitized
+ * descriptor to disk below. */
+} else if (line.startsWith("router-signature")) {
+
+  /* Write the scrubbed "router" line now based on the "router",
+   * "fingerprint", and "published" lines that we read before. Also
+   * scrub any "or-address" lines. */
+  if (null == routerLine || null == fingerprintBytes
+  || null == published) {
+logger.warn("Missing either of the following lines that are "
++ "required to sanitize this server bridge descriptor: "
++ "\"router\", \"fingerprint\", \"published\". Skipping "
++ "descriptor.");
+return;
+  }
   try {
-scrubbedAddress = scrubIpv4Address(address, fingerprintBytes,
-published);
 if (orAddresses != null) {
   scrubbedOrAddresses = new ArrayList<>();
   for (String orAddress : orAddresses) {
@@ -781,21 +834,9 @@ 

[tor-commits] [collector/master] Retain "bridge-distribution-request" lines.

[karsten]

commit e54bca3f9588c3253d9f244d10819f82399b4539
Author: Karsten Loesing 
Date:   Wed Oct 25 20:49:18 2017 +0200

Retain "bridge-distribution-request" lines.
---
 .../org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index 441eb01..12b42ac 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -946,7 +946,8 @@ public class SanitizedBridgesWriter extends CollecTorMain {
 || line.equals("opt allow-single-hop-exits")
 || line.equals("allow-single-hop-exits")
 || line.startsWith("ipv6-policy ")
-|| line.equals("tunnelled-dir-server")) {
+|| line.equals("tunnelled-dir-server")
+|| line.startsWith("bridge-distribution-request ")) {
   scrubbed.append(line + "\n");
 
 /* Replace node fingerprints in the family line with their hashes



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Add change log entries for the two #23981 changes.

[karsten]

commit 7cfb69ad036052d0d62a2c64efcd01df8bcb5145
Author: Karsten Loesing 
Date:   Wed Oct 25 20:50:29 2017 +0200

Add change log entries for the two #23981 changes.
---
 CHANGELOG.md | 9 +
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b12b33b..c924f5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Changes in version 1.4.1 - 2017-10-26
+
+ * Medium changes
+   - Handle bridge descriptors with an unusual order of "published"
+ and "fingerprint" lines.
+   - Retain "bridge-distribution-request" lines when sanitizing
+ descriptors.
+
+
 # Changes in version 1.4.0 - 2017-10-09
 
  * Major changes



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Add test that will fail #23981.

[karsten]

commit 3a95892de3bb4728a45812b2cc2ed9d24a7de33e
Author: Karsten Loesing 
Date:   Wed Oct 25 16:45:38 2017 +0200

Add test that will fail #23981.
---
 .../collector/bridgedescs/SanitizedBridgesWriterTest.java  | 14 ++
 1 file changed, 14 insertions(+)

diff --git 
a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
 
b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
index 0e62573..3afe9cb 100644
--- 
a/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
+++ 
b/src/test/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriterTest.java
@@ -440,6 +440,20 @@ public class SanitizedBridgesWriterTest {
   }
 
   @Test
+  public void testServerDescriptorPublishedLineAfterFingerprintLine()
+  throws Exception {
+this.configuration.setProperty(Key.ReplaceIpAddressesWithHashes.name(),
+"true");
+String fingerprintLine =
+"fingerprint 46D4 A711 97B8 FA51 5A82 6C6B 017C 522F E264 655B";
+this.defaultServerDescriptorBuilder.removeLine(fingerprintLine);
+this.defaultServerDescriptorBuilder.insertBeforeLineStartingWith(
+"published ", Arrays.asList(fingerprintLine));
+this.runTest();
+assertFalse(this.parsedServerDescriptors.isEmpty());
+  }
+
+  @Test
   public void testExtraInfoDescriptorDefault() throws Exception {
 this.runTest();
 List expectedLines = Arrays.asList(



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Prepare for 1.4.1 release.

[karsten]

commit 56a303ecdb9c7f12fe117731a5511667e9763d31
Author: Karsten Loesing 
Date:   Wed Oct 25 20:51:30 2017 +0200

Prepare for 1.4.1 release.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c4f4bd0..fb87709 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   
   
-  
+  
   
   
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Update metrics-base.

[karsten]

commit 3a0ba1baba1e77780803a7ed0559be122a6f01b6
Author: Karsten Loesing 
Date:   Wed Oct 25 20:50:00 2017 +0200

Update metrics-base.
---
 src/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build b/src/build
index 78e533f..4b34756 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 78e533fdc84e20769a8a155d1426cbea59c6e7cc
+Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit 76330218fd530f68e8fd619c75d5fa05dfa2bc08
Author: Translation commit bot 
Date:   Thu Oct 26 07:51:06 2017 +

Update translations for tor-browser-manual
---
 nl/nl.po | 28 
 1 file changed, 28 insertions(+)

diff --git a/nl/nl.po b/nl/nl.po
index d7c77a2f7..77f080e8b 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1055,6 +1055,9 @@ msgid ""
 "service in order to connect to it. An onion address is a string of sixteen "
 "mostly random letters and numbers, followed by “.onion”."
 msgstr ""
+"Net gelijk elk andere website, zult u het adres van de onion service moeten "
+"weten voordat u ermee kan verbinden. Een onion adres is een string van 16 "
+"meestal random letters en cijfers, gevolgd bij \".onion\"."
 
 #: onionsites.page:58 troubleshooting.page:10
 msgid "Troubleshooting"
@@ -1066,6 +1069,9 @@ msgid ""
 "entered the 16-character onion address correctly: even a small mistake will "
 "stop Tor Browser from being able to reach the site."
 msgstr ""
+"Als u niet kan verbinden met de onion service die u wenst, zorg ervoor dat u"
+" het 16 teken onion adres correct hebt ingevoerd: zelfs een kleinste fout "
+"zal Tor Browser stoppen van het verbinden met de site."
 
 #: onionsites.page:64
 msgid ""
@@ -1073,6 +1079,10 @@ msgid ""
 "later. There may be a temporary connection issue, or the site operators may "
 "have allowed it to go offline without warning."
 msgstr ""
+"Als u nog steeds niet kunt verbinden met de onion service, probeer dan op "
+"een later moment opnieuw. Er zouden tijdelijke verbindings problemen kunnen "
+"zijn, of de site beheerders hebben de site offline gehaald zonder het te "
+"laten weten."
 
 #: onionsites.page:69
 msgid ""
@@ -1080,6 +1090,9 @@ msgid ""
 "connecting to http://3g2upl4pq6kufc4m.onion/\;>DuckDuckGo's "
 "Onion Service"
 msgstr ""
+"U kunt alsook verbinden met andere onion services door te verbinden met "
+"http://3g2upl4pq6kufc4m.onion/\;>DuckDuckGo's Onion "
+"Service"
 
 #: plugins.page:6
 msgid "How Tor Browser handles add-ons, plugins and JavaScript"
@@ -1102,6 +1115,13 @@ msgid ""
 "operators, or to an outside observer. For this reason, Flash is disabled by "
 "default in Tor Browser, and enabling it is not recommended."
 msgstr ""
+"Video websites, zoals Vimeo maken gebruik van Flash Player plugin om video "
+"inhoud te weergeven. Helaas werkt deze software onafhankelijk van Tor "
+"Browser en kan niet gemakkelijk verplicht worden Tor Browser's proxy "
+"instellingen te gebruiken. Daardoor kan het gemakkelijk uw echte locatie en "
+"IP adres aan de website beheerders, of naar een buitenstaande waarnemer "
+"onthullen. Voor deze reden is Flash standaard gedeactiveerd in Tor Browser, "
+"en wordt het inschakelen afgeraden.  "
 
 #: plugins.page:23
 msgid ""
@@ -1124,6 +1144,10 @@ msgid ""
 "Unfortunately, JavaScript can also enable attacks on the security of the "
 "browser, which might lead to deanonymization."
 msgstr ""
+"JavaScript is een programmeer taal die websites gebruiken om interactive "
+"elementen zoals video, animatie, audio, en status tijdlijnen aan te bieden. "
+"Helaas kan JavaScript ook aanvallen op de beveiliging van de browser "
+"toelaten, die tot de-anonimisatie kunnen lijden."
 
 #: plugins.page:39
 msgid ""
@@ -1131,6 +1155,10 @@ msgid ""
 "icon at the top-left of the window, which allows you to control the "
 "JavaScript that runs on individual web pages, or to block it entirely."
 msgstr ""
+"Tor Browser omvat een add-on genaamd NoScript, toegankelijk via het \"S\" "
+"icoon in de linker boven hoek van het venster, die u toelaat het JavaScript "
+"te controleren dat wordt uitgevoerd op individuele pagina's, of om het "
+"volledig te blokkeren."
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

[translation]

commit 12281179dc27a4c155a6dd219f99af9056753073
Author: Translation commit bot 
Date:   Thu Oct 26 07:45:54 2017 +

Update translations for https_everywhere_completed
---
 ar/https-everywhere.dtd | 34 ++
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index 59d341d10..b7f2e7a39 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -2,42 +2,22 @@
 
 
 
-
-
-
 
-
-
-
-
-
-
-
-
 
 
-
 
 
-
 
 
 
 
-
-
-
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -53,5 +33,3 @@
 
 
 
-
-

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

[translation]

commit 22ba88a1027452c391f0607a36cb5409eb200143
Author: Translation commit bot 
Date:   Thu Oct 26 07:45:43 2017 +

Update translations for https_everywhere
---
 ar/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index bb300e847..b7f2e7a39 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -11,12 +11,12 @@
 
 
 
-
-
+
+
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

[translation]

commit 5f7ef1e0dd0f0dd21abc9d6a6a71af78bcac2cd6
Author: Translation commit bot 
Date:   Thu Oct 26 07:20:56 2017 +

Update translations for tor-browser-manual
---
 nl/nl.po | 41 -
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/nl/nl.po b/nl/nl.po
index af2713c85..d7c77a2f7 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -898,6 +898,13 @@ msgid ""
 "following the site’s recommended procedure for account recovery, or "
 "contacting the operators and explaining the situation."
 msgstr ""
+"Tor Browser laat het vaak lijken alsof u verbinding komt van een helemaal "
+"verschillend deel van de wereld. Sommige websites zoals banken of email "
+"providers, zullen dit dan misschien interpreteren als een teken dat uw "
+"account misschien is gehackt of aangetast, en zullen u dan uw toegang "
+"ontzeggen. De enige manier om dit op te lossen is de sites aanbevolen "
+"procedure voor account recovery volgen, of de beheerders contacteren en de "
+"situatie uitleggen."
 
 #: managing-identities.page:101
 msgid "Changing identities and circuits"
@@ -921,6 +928,8 @@ msgid ""
 "Tor Browser features “New Identity” and “New Tor Circuit for this 
Site” "
 "options, located in the Torbutton menu."
 msgstr ""
+"Tor Browsers features \"Nieuwe Identiteit\" en \"Nieuw Tor Circuit voor deze"
+" Site\" opties, deze vind u terug in het Torbutton menu."
 
 #: managing-identities.page:111
 msgid "New Identity"
@@ -935,6 +944,13 @@ msgid ""
 "connections. Tor Browser will warn you that all activity and downloads will "
 "be stopped, so take this into account before clicking “New Identity”."
 msgstr ""
+"Deze optie is handig als u wilt voorkomen dat uw hierop volgende browser "
+"activiteit gelinkt kan worden aan wat u hiervoor aan het doen was. Als u "
+"hiervoor kiest, zullen al uw tabladen en vensters gesloten worden, al uw "
+"persoonlijk informatie zoals cookies en geschiedenis wissen, en nieuwe Tor "
+"circuits voor alle verbindingen gebruiken. Tor Browser zal uw waarschuwen "
+"dat alle activiteit en downloads gestopt zullen worden, houd hier dus "
+"rekening mee voor dat u klikt op \"Nieuwe Identiteit\"."
 
 #: managing-identities.page:123
 msgid "New Tor Circuit for this Site"
@@ -951,10 +967,19 @@ msgid ""
 "or unlink your activity, nor does it affect your current connections to "
 "other websites."
 msgstr ""
+"Deze optie is handig als de exit relay die u gebruikt niet instaat is om de verbinden met"
+" de website die u wenst, of niet laad zoals hij hoort. Voor deze optie "
+"kiezen zal ervoor zorgen dat het huidige tablad of venster zal herladen "
+"worden over een nieuw Tor circuit. Andere geopende tabs en vensters van "
+"dezelfde website zullen ook een nieuw Tor circuit gebruiken eens ze herladen"
+" zijn. Deze optie verwijderd geen persoonlijke informatie, zal uw activiteit"
+" niet ontkoppelen en zal ook niet uw huidige verbindingen naar andere "
+"websites veranderen."
 
 #: onionsites.page:6
 msgid "Services that are only accessible using Tor"
-msgstr ""
+msgstr "Services die alleen toegankelijk zijn via Tor"
 
 #: onionsites.page:10
 msgid "Onion Services"
@@ -965,18 +990,25 @@ msgid ""
 "Onion services (formerly known as “hidden services”) are services (like "
 "websites) that are only accessible through the Tor network."
 msgstr ""
+"Onion services (voorheen bekend als \"hidden services\") zijn services "
+"(zoals websites) die alleen toegankelijk zijn via het Tor netwerk."
 
 #: onionsites.page:16
 msgid ""
 "Onion services offer several advantages over ordinary services on the non-"
 "private web:"
 msgstr ""
+"Onion services bieden verschillende voordelen aan vergeleken met gewone "
+"services op het niet private web:"
 
 #: 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 ""
+"Een onion services zijn locatie en IP adres zijn verborgen, zodat het "
+"moeilijk is voor tegenstanders om het te censureren of de beheerder te "
+"identificeren."
 
 #: onionsites.page:29
 msgid ""
@@ -984,6 +1016,9 @@ msgid ""
 " you do not need to worry about connecting"
 " over HTTPS."
 msgstr ""
+"All het verkeer tussen Tor gebruikers en onion services gebruiken end-to-end"
+" encryptie, dus u hoeft geen zorgen te maken over verbinden over HTTPS."
 
 #: onionsites.page:36
 msgid ""
@@ -992,6 +1027,10 @@ msgid ""
 " that it is connecting to the right location and that the connection is not "
 "being tampered with."
 msgstr ""
+"Het adres van een onion service wordt automatisch gegenereerd, zodat de "
+"beheerder geen domeinnaam hoeft te kopen; de .onion URL helpt Tor te "
+"verzekeren dat de verbinding naar de juiste locatie gemaakt wordt en dat er "
+"niet met de verbinding wordt geknoeid."
 
 #: onionsites.page:46
 msgid "How to access an onion service"

___