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

2016-08-22 Thread translation 
commit 46e47d70ae4e8d3b0981f68b5e7505cdcd6ea20e
Author: Translation commit bot 
Date:   Tue Aug 23 03:18:23 2016 +

Update translations for tor-messenger-prefsdtd
---
 tr/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/prefs.dtd b/tr/prefs.dtd
index e3fb384..94f614c 100644
--- a/tr/prefs.dtd
+++ b/tr/prefs.dtd
@@ -1,5 +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-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-22 Thread translation 
commit cb9c1dbb8fde2be5b8b0ba0398ca3cc96cbbaae0
Author: Translation commit bot 
Date:   Tue Aug 23 03:18:42 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 tr/prefs.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tr/prefs.dtd b/tr/prefs.dtd
index 41dd2ad..94f614c 100644
--- a/tr/prefs.dtd
+++ b/tr/prefs.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/tails-onioncircuits] Update translations for tails-onioncircuits

2016-08-22 Thread translation 
commit 031ec2eb8c8b8c0701a34e6281ba95df2d2d7782
Author: Translation commit bot 
Date:   Tue Aug 23 00:48:37 2016 +

Update translations for tails-onioncircuits
---
 eu/onioncircuits.pot | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/eu/onioncircuits.pot b/eu/onioncircuits.pot
index 3c44829..9c25d3d 100644
--- a/eu/onioncircuits.pot
+++ b/eu/onioncircuits.pot
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Panoramix Zelta , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-06-01 09:23+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-23 00:37+\n"
+"Last-Translator: Panoramix Zelta \n"
 "Language-Team: Basque 
(http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr ""
+msgstr "Oraindik ez zaude Tor-era konektaturik"
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
@@ -39,11 +40,11 @@ msgstr ""
 
 #: ../onioncircuits:221
 msgid "The connection to Tor was lost..."
-msgstr ""
+msgstr "Tor-erako konexioa galdu da..."
 
 #: ../onioncircuits:317
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: ../onioncircuits:343
 #, c-format
@@ -66,7 +67,7 @@ msgstr ""
 
 #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594
 msgid "Unknown"
-msgstr ""
+msgstr "Ezezaguna"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
@@ -74,7 +75,7 @@ msgstr "Hatz-marka:"
 
 #: ../onioncircuits:608
 msgid "Published:"
-msgstr ""
+msgstr "Argitaratua:"
 
 #: ../onioncircuits:609
 msgid "IP:"

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

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

2016-08-22 Thread translation 
commit 48d2c782ce65df7fbf23054d2d43123084ee5ed6
Author: Translation commit bot 
Date:   Tue Aug 23 00:46:43 2016 +

Update translations for tails-iuk
---
 eu.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/eu.po b/eu.po
index c878aff..0ea8333 100644
--- a/eu.po
+++ b/eu.po
@@ -6,13 +6,14 @@
 # jonbraun , 2014
 # Antxon Baldarra , 2013
 # Eneko, 2015
+# Panoramix Zelta , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-05-26 08:49+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-23 00:44+\n"
+"Last-Translator: Panoramix Zelta \n"
 "Language-Team: Basque 
(http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -119,11 +120,11 @@ msgstr "Eguneraketa eskuragarri"
 
 #: ../lib/Tails/IUK/Frontend.pm:387
 msgid "Upgrade now"
-msgstr ""
+msgstr "Eguneratu orain"
 
 #: ../lib/Tails/IUK/Frontend.pm:388
 msgid "Upgrade later"
-msgstr ""
+msgstr "Eguneratu beranduago"
 
 #: ../lib/Tails/IUK/Frontend.pm:396
 #, perl-brace-format
@@ -175,7 +176,7 @@ msgstr "Errore bat gertatu da aldi baterako 
deskarga-direktorioa sortzean"
 
 #: ../lib/Tails/IUK/Frontend.pm:563
 msgid "Failed to create temporary download directory"
-msgstr ""
+msgstr "Huts egin du aldi baterako deskarga-direktorioa sortzean"
 
 #: ../lib/Tails/IUK/Frontend.pm:587
 msgid ""
@@ -186,7 +187,7 @@ msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:591
 msgid "Error while choosing a download server"
-msgstr ""
+msgstr "Errore bat gertatu da jeitsiera zerbitzaria aukeratzean"
 
 #: ../lib/Tails/IUK/Frontend.pm:608
 msgid ""
@@ -216,7 +217,7 @@ msgstr "Errore bat gertatu da sistema berrabiaraztean"
 
 #: ../lib/Tails/IUK/Frontend.pm:629
 msgid "Failed to restart the system"
-msgstr ""
+msgstr "Huts egin du sistema berrabiaraztean"
 
 #: ../lib/Tails/IUK/Frontend.pm:644
 msgid "Error while shutting down the network"
@@ -224,11 +225,11 @@ msgstr "Errore bat gertatu da sarea itzaltzean"
 
 #: ../lib/Tails/IUK/Frontend.pm:647
 msgid "Failed to shutdown network"
-msgstr ""
+msgstr "Huts egin du sarea itzaltzerakoan"
 
 #: ../lib/Tails/IUK/Frontend.pm:657
 msgid "Upgrading the system"
-msgstr ""
+msgstr "Sistema eguneratzen"
 
 #: ../lib/Tails/IUK/Frontend.pm:659
 msgid ""

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2016-08-22 Thread translation 
commit 7926eea44e5b4c26479473ab417caa9480e9532e
Author: Translation commit bot 
Date:   Tue Aug 23 00:45:57 2016 +

Update translations for mat-gui_completed
---
 eu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu.po b/eu.po
index c284656..ca47970 100644
--- a/eu.po
+++ b/eu.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-03-21 16:34+\n"
+"PO-Revision-Date: 2016-08-23 00:36+\n"
 "Last-Translator: Antxon Baldarra \n"
 "Language-Team: Basque 
(http://www.transifex.com/otf/torproject/language/eu/)\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/mat-gui] Update translations for mat-gui

2016-08-22 Thread translation 
commit 4826abc8b1a2ced981b84399dbe23adb8f249df0
Author: Translation commit bot 
Date:   Tue Aug 23 00:45:51 2016 +

Update translations for mat-gui
---
 eu.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu.po b/eu.po
index c284656..ca47970 100644
--- a/eu.po
+++ b/eu.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-03-21 16:34+\n"
+"PO-Revision-Date: 2016-08-23 00:36+\n"
 "Last-Translator: Antxon Baldarra \n"
 "Language-Team: Basque 
(http://www.transifex.com/otf/torproject/language/eu/)\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] [webwml/master] Update debian packge with 0.2.9-experimental

2016-08-22 Thread sebastian 
commit 3c84d62498f289083b36e229f88e4cdc0c3e9bdb
Author: Sebastian Hahn 
Date:   Tue Aug 23 01:45:06 2016 +0200

Update debian packge with 0.2.9-experimental
---
 docs/en/debian.wml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/debian.wml b/docs/en/debian.wml
index 5f0581d..de91aaa 100644
--- a/docs/en/debian.wml
+++ b/docs/en/debian.wml
@@ -21,7 +21,7 @@ var software = {
  'wily':[ 'wily'],
  'xenial':  [ 'xenial'],
  },
- 'experimental-0.2.8.x': {
+ 'experimental-0.2.9.x': {
  'wheezy':  [ 'wheezy' ],
  'jessie':  [ 'jessie' ],
  'stretch': [ 'stretch' ],
@@ -43,7 +43,7 @@ var software = {
  'wily':[ 'wily'],
  'xenial':  [ 'xenial'],
  },
- 'experimental-0.2.8.x': {
+ 'experimental-0.2.9.x': {
  'wheezy':  [ 'wheezy' ],
  'jessie':  [ 'jessie' ],
  'stretch': [ 'stretch' ],
@@ -365,7 +365,7 @@ download/download>#packagediff">development branch of 
Tor instead
 to your /etc/apt/sources.list file:
 
 deb http://deb.torproject.org/torproject.org DISTRIBUTION main
-deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-DISTRIBUTION main
+deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.9.x-DISTRIBUTION main
 
 where you again substitute the name of your distro (lenny,
 sid, saucy, ...) in place of
@@ -403,7 +403,7 @@ deb-src http://deb.torproject.org/torproject.org 
DISTRIBUTION main
 
 # For the unstable version.
 deb-src http://deb.torproject.org/torproject.org DISTRIBUTION main
-deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-DISTRIBUTION main
+deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.9.x-DISTRIBUTION main
 
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of 
DISTRIBUTION. Now refresh your sources by running (as root):
 

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

[tor-commits] [tor/master] Add two new packagers.

2016-08-22 Thread nickm 
commit b3f43a22ab921ce6e256dd8f4e1cbedf2d280392
Author: Nick Mathewson 
Date:   Mon Aug 22 16:51:33 2016 -0400

Add two new packagers.

Also, stop implying that Roger still does all the source releases.
---
 doc/HACKING/ReleasingTor.md | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index 8f5a47d..7c61446 100644
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -2,7 +2,8 @@
 Putting out a new release
 -
 
-Here are the steps Roger takes when putting out a new Tor release:
+Here are the steps that the maintainer should take when putting out a
+new Tor release:
 
 === 0. Preliminaries
 
@@ -149,6 +150,8 @@ Here are the steps Roger takes when putting out a new Tor 
release:
- {paul} at invizbox dot io
- {lfleischer} at archlinux dot org
- {tails-dev} at boum dot org
+   - {Nathan} at freitas dot net
+   - {mike} at tig dot as
 
 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] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-22 Thread translation 
commit 4f136568f702825b77ecb4acaa6cb83f3a978099
Author: Translation commit bot 
Date:   Mon Aug 22 20:48:24 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 es/prefs.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index c5651de..7e8c1fa 100644
--- a/es/prefs.dtd
+++ b/es/prefs.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-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-22 Thread translation 
commit 0f48fe6d9e37d9d94abde2591cb0a683bc04f59e
Author: Translation commit bot 
Date:   Mon Aug 22 20:48:08 2016 +

Update translations for tor-messenger-prefsdtd
---
 es/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index 5f05029..7e8c1fa 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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

[tor-commits] [tor/release-0.2.8] Do not pass NULL to log(%s) in dir_server_new.

2016-08-22 Thread nickm 
commit 0ba05313d56e6737c73d003c84eeebdfd0d40398
Author: Nick Mathewson 
Date:   Mon Aug 22 01:22:19 2016 -0400

Do not pass NULL to log(%s) in dir_server_new.

This bug had existed since 0.2.4.7-alpha, but now that we have
FallbackDirs by default, it actually matters.

Fixes bug 19947; bugfix on 0.2.4.7-alpha or maybe 0.2.8.1-alpha.

Rubiate wrote the patch; teor wrote the changes file.
---
 changes/bug19947| 4 
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug19947 b/changes/bug19947
new file mode 100644
index 000..b9dce8b
--- /dev/null
+++ b/changes/bug19947
@@ -0,0 +1,4 @@
+ o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback directory 
information.
+  Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
+  Report and patch by "rubiate".
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 620c32d..c358872 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4337,10 +4337,10 @@ dir_server_new(int is_authority,
 
   if (nickname)
 tor_asprintf(>description, "directory server \"%s\" at %s:%d",
- nickname, hostname, (int)dir_port);
+ nickname, hostname_, (int)dir_port);
   else
 tor_asprintf(>description, "directory server at %s:%d",
- hostname, (int)dir_port);
+ hostname_, (int)dir_port);
 
   ent->fake_status.addr = ent->addr;
   tor_addr_copy(>fake_status.ipv6_addr, >ipv6_addr);



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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-08-22 Thread nickm 
commit e085b11d27f3396e0fd49156d74245594fd4eb88
Merge: 6e181ba 0ba0531
Author: Nick Mathewson 
Date:   Mon Aug 22 10:19:52 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19947| 4 
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] Do not pass NULL to log(%s) in dir_server_new.

2016-08-22 Thread nickm 
commit 0ba05313d56e6737c73d003c84eeebdfd0d40398
Author: Nick Mathewson 
Date:   Mon Aug 22 01:22:19 2016 -0400

Do not pass NULL to log(%s) in dir_server_new.

This bug had existed since 0.2.4.7-alpha, but now that we have
FallbackDirs by default, it actually matters.

Fixes bug 19947; bugfix on 0.2.4.7-alpha or maybe 0.2.8.1-alpha.

Rubiate wrote the patch; teor wrote the changes file.
---
 changes/bug19947| 4 
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug19947 b/changes/bug19947
new file mode 100644
index 000..b9dce8b
--- /dev/null
+++ b/changes/bug19947
@@ -0,0 +1,4 @@
+ o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback directory 
information.
+  Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
+  Report and patch by "rubiate".
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 620c32d..c358872 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4337,10 +4337,10 @@ dir_server_new(int is_authority,
 
   if (nickname)
 tor_asprintf(>description, "directory server \"%s\" at %s:%d",
- nickname, hostname, (int)dir_port);
+ nickname, hostname_, (int)dir_port);
   else
 tor_asprintf(>description, "directory server at %s:%d",
- hostname, (int)dir_port);
+ hostname_, (int)dir_port);
 
   ent->fake_status.addr = ent->addr;
   tor_addr_copy(>fake_status.ipv6_addr, >ipv6_addr);



___
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.2.8'

2016-08-22 Thread nickm 
commit 62b239dd9c3c1945a72062223f5b131204ea987a
Merge: 3c8baa7 0ba0531
Author: Nick Mathewson 
Date:   Mon Aug 22 10:19:15 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug19947| 4 
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2016-08-22 Thread translation 
commit 9bcd7f224457d2267da5b5e89adca1a3b99caa18
Author: Translation commit bot 
Date:   Mon Aug 22 13:46:47 2016 +

Update translations for tor-and-https
---
 nl.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nl.po b/nl.po
index 9b2f50c..62bd9c0 100644
--- a/nl.po
+++ b/nl.po
@@ -1,13 +1,14 @@
 # 
 # Translators:
 # Ann Boen , 2014
+# Nathan Follens, 2016
 # BBLN , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Cleveridge \n"
+"PO-Revision-Date: 2016-08-22 13:29+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,4 +135,4 @@ msgstr "Afluisteren"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Data sharing"
-msgstr "delen van data"
+msgstr "Gegevens delen"

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

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2016-08-22 Thread translation 
commit 44ea18d2e4d5664a6301c70580f5c7f4127f0be8
Author: Translation commit bot 
Date:   Mon Aug 22 13:46:54 2016 +

Update translations for tor-and-https_completed
---
 nl.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nl.po b/nl.po
index 9b2f50c..62bd9c0 100644
--- a/nl.po
+++ b/nl.po
@@ -1,13 +1,14 @@
 # 
 # Translators:
 # Ann Boen , 2014
+# Nathan Follens, 2016
 # BBLN , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Cleveridge \n"
+"PO-Revision-Date: 2016-08-22 13:29+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,4 +135,4 @@ msgstr "Afluisteren"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Data sharing"
-msgstr "delen van data"
+msgstr "Gegevens delen"

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

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

2016-08-22 Thread translation 
commit b519c237110c82ed993215306b9f972624998ea0
Author: Translation commit bot 
Date:   Mon Aug 22 11:48:21 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 nl/prefs.dtd | 3 ++-
 ro/prefs.dtd | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nl/prefs.dtd b/nl/prefs.dtd
index 0288422..6928cfd 100644
--- a/nl/prefs.dtd
+++ b/nl/prefs.dtd
@@ -1,7 +1,8 @@
 
+
 
 
-
+
 
 
 
diff --git a/ro/prefs.dtd b/ro/prefs.dtd
index 3bc3ab7..58c1a7a 100644
--- a/ro/prefs.dtd
+++ b/ro/prefs.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-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-22 Thread translation 
commit 1781be57ed24ff2c6e0c8c75e1e1bcb2df8410ed
Author: Translation commit bot 
Date:   Mon Aug 22 11:48:07 2016 +

Update translations for tor-messenger-prefsdtd
---
 nl/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/prefs.dtd b/nl/prefs.dtd
index ed687f4..6928cfd 100644
--- a/nl/prefs.dtd
+++ b/nl/prefs.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

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

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

2016-08-22 Thread translation 
commit e7d65c1991534c094fb4e0720f97d9257033d8a5
Author: Translation commit bot 
Date:   Mon Aug 22 11:46:51 2016 +

Update translations for tor_animation
---
 nl.srt | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nl.srt b/nl.srt
index 17e21cb..92db867 100644
--- a/nl.srt
+++ b/nl.srt
@@ -1,19 +1,19 @@
 1
 00:00:00,660 --> 00:00:02,780
-Wij zijn zeer gewend geraakt aan het internet.
+We zijn zeer gewend geraakt aan het internet.
 
 2
 00:00:03,120 --> 00:00:07,700
-Wij delen constant informatie over onszelf
+We delen constant informatie over onszelf
 en ons privéleven:
 
 3
 00:00:08,000 --> 00:00:09,960
-voedsel dat we eten, mensen die wij ontmoeten,
+voedsel dat we eten, mensen die we ontmoeten,
 
 4
 00:00:10,180 --> 00:00:12,480
-waar wij naartoe gaan en wat wij lezen.
+waar we naartoe gaan en wat we lezen.
 
 5
 00:00:13,280 --> 00:00:14,640
@@ -36,11 +36,11 @@ de webbrowser die u gebruikt
 9
 00:00:26,700 --> 00:00:29,140
 en nog veel meer informatie
-over jou en je leven
+over u en uw leven
 
 10
 00:00:29,200 --> 00:00:31,500
-die je waarschijnlijk niet met
+die u waarschijnlijk niet met
 onbekende mensen zou willen delen,
 
 11
@@ -94,7 +94,7 @@ een voordeel slaan uit uw persoonlijke informatie.
 21
 00:01:12,880 --> 00:01:15,640
 Tor zorgt ervoor dat zijn gebruikers
-er allemaal hetzelfde uit zien
+er allemaal hetzelfde uit zien;
 
 22
 00:01:15,920 --> 00:01:18,800
@@ -113,17 +113,17 @@ mensen te verstoppen die er allemaal hetzelfde uitzien.
 
 25
 00:01:28,700 --> 00:01:31,240
-Je kunt censuur omzeilen zonder
-dat je je zorgen moet maken
+U kan censuur omzeilen zonder
+dat u zich zorgen moet maken
 
 26
 00:01:31,400 --> 00:01:34,100
 dat de censor weet wat
-je op het internet doet.
+u op het internet doet.
 
 27
 00:01:36,540 --> 00:01:39,440
-De advertenties volgen je niet
+De advertenties volgen u niet
 maandenlang overal naartoe,
 
 28
@@ -133,8 +133,8 @@ op een product.
 
 29
 00:01:43,880 --> 00:01:47,380
-Als je Tor gebruikt weten de bezochte
-pagina's niet eens wie je bent,
+Als u Tor gebruikt weten de bezochte
+pagina's niet eens wie u bent,
 
 30
 00:01:47,540 --> 00:01:49,760
@@ -143,15 +143,15 @@ de pagina bezoekt,
 
 31
 00:01:49,920 --> 00:01:51,920
-tenzij je gaat inloggen en het daardoor verklapt.
+tenzij u gaat inloggen en het daardoor verklapt.
 
 32
 00:01:54,200 --> 00:01:55,840
-Door het downloaden en gebruiken van Tor,
+Door het downloaden en gebruiken van Tor
 
 33
 00:01:56,200 --> 00:01:58,560
-kun je de mensen beschermen
+kan u de mensen beschermen
 die anonimiteit nodig hebben,
 
 34

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

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

2016-08-22 Thread translation 
commit 2f9b80bc0a4714f94f14c640a10ac05f5d135011
Author: Translation commit bot 
Date:   Mon Aug 22 11:46:54 2016 +

Update translations for tor_animation_completed
---
 nl.srt | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/nl.srt b/nl.srt
index 17e21cb..92db867 100644
--- a/nl.srt
+++ b/nl.srt
@@ -1,19 +1,19 @@
 1
 00:00:00,660 --> 00:00:02,780
-Wij zijn zeer gewend geraakt aan het internet.
+We zijn zeer gewend geraakt aan het internet.
 
 2
 00:00:03,120 --> 00:00:07,700
-Wij delen constant informatie over onszelf
+We delen constant informatie over onszelf
 en ons privéleven:
 
 3
 00:00:08,000 --> 00:00:09,960
-voedsel dat we eten, mensen die wij ontmoeten,
+voedsel dat we eten, mensen die we ontmoeten,
 
 4
 00:00:10,180 --> 00:00:12,480
-waar wij naartoe gaan en wat wij lezen.
+waar we naartoe gaan en wat we lezen.
 
 5
 00:00:13,280 --> 00:00:14,640
@@ -36,11 +36,11 @@ de webbrowser die u gebruikt
 9
 00:00:26,700 --> 00:00:29,140
 en nog veel meer informatie
-over jou en je leven
+over u en uw leven
 
 10
 00:00:29,200 --> 00:00:31,500
-die je waarschijnlijk niet met
+die u waarschijnlijk niet met
 onbekende mensen zou willen delen,
 
 11
@@ -94,7 +94,7 @@ een voordeel slaan uit uw persoonlijke informatie.
 21
 00:01:12,880 --> 00:01:15,640
 Tor zorgt ervoor dat zijn gebruikers
-er allemaal hetzelfde uit zien
+er allemaal hetzelfde uit zien;
 
 22
 00:01:15,920 --> 00:01:18,800
@@ -113,17 +113,17 @@ mensen te verstoppen die er allemaal hetzelfde uitzien.
 
 25
 00:01:28,700 --> 00:01:31,240
-Je kunt censuur omzeilen zonder
-dat je je zorgen moet maken
+U kan censuur omzeilen zonder
+dat u zich zorgen moet maken
 
 26
 00:01:31,400 --> 00:01:34,100
 dat de censor weet wat
-je op het internet doet.
+u op het internet doet.
 
 27
 00:01:36,540 --> 00:01:39,440
-De advertenties volgen je niet
+De advertenties volgen u niet
 maandenlang overal naartoe,
 
 28
@@ -133,8 +133,8 @@ op een product.
 
 29
 00:01:43,880 --> 00:01:47,380
-Als je Tor gebruikt weten de bezochte
-pagina's niet eens wie je bent,
+Als u Tor gebruikt weten de bezochte
+pagina's niet eens wie u bent,
 
 30
 00:01:47,540 --> 00:01:49,760
@@ -143,15 +143,15 @@ de pagina bezoekt,
 
 31
 00:01:49,920 --> 00:01:51,920
-tenzij je gaat inloggen en het daardoor verklapt.
+tenzij u gaat inloggen en het daardoor verklapt.
 
 32
 00:01:54,200 --> 00:01:55,840
-Door het downloaden en gebruiken van Tor,
+Door het downloaden en gebruiken van Tor
 
 33
 00:01:56,200 --> 00:01:58,560
-kun je de mensen beschermen
+kan u de mensen beschermen
 die anonimiteit nodig hebben,
 
 34

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

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

2016-08-22 Thread translation 
commit dd0de75aaa62f2ce4b03d8fa6c4dd6a37d2f9ef6
Author: Translation commit bot 
Date:   Mon Aug 22 11:18:16 2016 +

Update translations for tor-messenger-prefsdtd
---
 lt/prefs.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lt/prefs.dtd b/lt/prefs.dtd
index 211d141..4327c58 100644
--- a/lt/prefs.dtd
+++ b/lt/prefs.dtd
@@ -1,14 +1,14 @@
-
+
 
-
+
 
-
-
-
-
-
+
+
+
+
+
 
-
-
-
+
+
+
 
\ 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/tails-onioncircuits] Update translations for tails-onioncircuits

2016-08-22 Thread translation 
commit 84a50c33cce348284b124bc5d3f7866344398f6f
Author: Translation commit bot 
Date:   Mon Aug 22 11:18:44 2016 +

Update translations for tails-onioncircuits
---
 lt/onioncircuits.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lt/onioncircuits.pot b/lt/onioncircuits.pot
index aec1afc..2ccb44a 100644
--- a/lt/onioncircuits.pot
+++ b/lt/onioncircuits.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-07-02 09:29+\n"
+"PO-Revision-Date: 2016-08-22 11:00+\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@ msgstr ""
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr ""
+msgstr "Kontrolinis kodas:"
 
 #: ../onioncircuits:608
 msgid "Published:"

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

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

2016-08-22 Thread translation 
commit d78363b9523bce14c927eab082d1e5e8667d96bf
Author: Translation commit bot 
Date:   Mon Aug 22 11:18:29 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 hr_HR/prefs.dtd |  1 +
 lt/prefs.dtd| 14 ++
 2 files changed, 15 insertions(+)

diff --git a/hr_HR/prefs.dtd b/hr_HR/prefs.dtd
index e2bd232..f21c654 100644
--- a/hr_HR/prefs.dtd
+++ b/hr_HR/prefs.dtd
@@ -1,4 +1,5 @@
 
+
 
 
 
diff --git a/lt/prefs.dtd b/lt/prefs.dtd
new file mode 100644
index 000..4327c58
--- /dev/null
+++ b/lt/prefs.dtd
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-08-22 Thread translation 
commit 74b3ddcfe56874cb2e8f49304b2959e4ab6b2d44
Author: Translation commit bot 
Date:   Mon Aug 22 11:18:33 2016 +

Update translations for tails-openpgp-applet
---
 lt/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lt/openpgp-applet.pot b/lt/openpgp-applet.pot
index bf24325..ee48a12 100644
--- a/lt/openpgp-applet.pot
+++ b/lt/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-07-02 09:29+\n"
+"PO-Revision-Date: 2016-08-22 11:00+\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "BÅ«sena"
 
 #: bin/openpgp-applet:444
 msgid "Fingerprint:"
-msgstr ""
+msgstr "Kontrolinis kodas:"
 
 #: bin/openpgp-applet:447
 msgid "User ID:"

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

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

2016-08-22 Thread translation 
commit af326d83881abb2804a7dcf96375d78a3048c2ca
Author: Translation commit bot 
Date:   Mon Aug 22 11:17:49 2016 +

Update translations for tor-messenger-fingerdtd
---
 lt/finger.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/finger.dtd b/lt/finger.dtd
index 7b08f99..d929a3f 100644
--- a/lt/finger.dtd
+++ b/lt/finger.dtd
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 

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

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

2016-08-22 Thread translation 
commit 0a4788700eb9a2e67c782a537da4541474ca6b11
Author: Translation commit bot 
Date:   Mon Aug 22 11:16:16 2016 +

Update translations for tails-misc
---
 lt.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lt.po b/lt.po
index 5752d88..b0370b3 100644
--- a/lt.po
+++ b/lt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-06 14:26+0200\n"
-"PO-Revision-Date: 2016-07-22 09:46+\n"
+"POT-Creation-Date: 2016-07-31 10:43+0200\n"
+"PO-Revision-Date: 2016-08-22 11:00+\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -139,7 +139,7 @@ msgstr "Statusas"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:400
 msgid "Fingerprint:"
-msgstr ""
+msgstr "Kontrolinis kodas:"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:403
 msgid "User ID:"

___
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

2016-08-22 Thread translation 
commit 789ea66b675ed45d416397f78c666281464b1989
Author: Translation commit bot 
Date:   Mon Aug 22 11:15:28 2016 +

Update translations for https_everywhere_completed
---
 hr_HR/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd
index f775909..7dce9fc 100644
--- a/hr_HR/https-everywhere.dtd
+++ b/hr_HR/https-everywhere.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 

___
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

2016-08-22 Thread translation 
commit c3903e30c1f6f89b0d23f560da0716920bb588ee
Author: Translation commit bot 
Date:   Mon Aug 22 11:15:21 2016 +

Update translations for https_everywhere
---
 hr_HR/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd
index 29791d5..7dce9fc 100644
--- a/hr_HR/https-everywhere.dtd
+++ b/hr_HR/https-everywhere.dtd
@@ -20,7 +20,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [collector/master] Remove quotes around base URL in index.json.

2016-08-22 Thread karsten 
commit 0541b860894875188f31f6b5eeabd8db6cadd061
Author: Karsten Loesing 
Date:   Mon Aug 22 12:08:58 2016 +0200

Remove quotes around base URL in index.json.

Fixes #19924, spotted by iwakeh.
---
 CHANGELOG.md| 6 ++
 src/main/resources/collector.properties | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 931f29a..a8be9e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 1.1.0 - 2016-08-31
+
+ * Minor changes
+   - Remove quotes around base URL in index.json.
+
+
 # Changes in version 1.0.1 - 2016-08-22
 
  * Medium changes
diff --git a/src/main/resources/collector.properties 
b/src/main/resources/collector.properties
index f9b71bb..15b15aa 100644
--- a/src/main/resources/collector.properties
+++ b/src/main/resources/collector.properties
@@ -47,7 +47,7 @@ UpdateindexOffsetMinutes = 0
  General Properties 
 # The URL of this instance.  This will be the base URL
 # written to index.json
-InstanceBaseUrl = "https://collector.torproject.org;
+InstanceBaseUrl = https://collector.torproject.org
 # The target location for index.json and its compressed
 # versions index.json.gz, index.json.bz2, and index.json.xz
 IndexPath = .

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

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

2016-08-22 Thread translation 
commit 96dfc36ff10a677c7d2b4026751a36a72963ac4d
Author: Translation commit bot 
Date:   Mon Aug 22 09:48:19 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 hu/prefs.dtd | 1 +
 nb/prefs.dtd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hu/prefs.dtd b/hu/prefs.dtd
index 08154bb..5edbb12 100644
--- a/hu/prefs.dtd
+++ b/hu/prefs.dtd
@@ -1,4 +1,5 @@
 
+
 
 
 
diff --git a/nb/prefs.dtd b/nb/prefs.dtd
index 736291c..04f81f0 100644
--- a/nb/prefs.dtd
+++ b/nb/prefs.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] [metrics-lib/master] Add change log entry for #19643.

2016-08-22 Thread karsten 
commit f120e7f325472c662b2b31b0f5654689d322ee0a
Author: Karsten Loesing 
Date:   Mon Aug 22 11:27:08 2016 +0200

Add change log entry for #19643.
---
 CHANGELOG.md | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f034b5c..11d123b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changes in version 1.4.0 - 2016-08-24
+
+ * Minor changes
+   - Add slf4j for logging support.
+
+
 # Changes in version 1.3.1 - 2016-08-01
 
  * Medium changes

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

[tor-commits] [metrics-lib/master] Added slf4j for logging support; implements #19643.

2016-08-22 Thread karsten 
commit 1dab40d4505e731faccd5f722e5f7c250a2d4955
Author: iwakeh 
Date:   Fri Aug 19 13:23:07 2016 +0200

Added slf4j for logging support; implements #19643.

Tests use logback; runtime will use whatever slf4j implementation supplied.
Also removed TODOs about testing, b/c this is noticeable in our coverage 
report.
---
 build.xml  |  3 +++
 .../descriptor/impl/DescriptorCollectorImpl.java   | 12 +---
 .../descriptor/impl/DescriptorReaderImpl.java  | 22 ++
 .../impl/DirectoryKeyCertificateImpl.java  |  2 --
 .../descriptor/impl/DownloadCoordinatorImpl.java   |  9 +++--
 .../descriptor/impl/MicrodescriptorImpl.java   |  1 -
 .../descriptor/impl/NetworkStatusEntryImpl.java|  1 -
 .../descriptor/impl/ServerDescriptorImpl.java  |  1 -
 8 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/build.xml b/build.xml
index bb48dde..bfede7c 100644
--- a/build.xml
+++ b/build.xml
@@ -26,6 +26,7 @@
 
   
   
+  
   
   
 
@@ -52,6 +53,8 @@
 
   
   
+  
+  
 
   
 
diff --git 
a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java 
b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java
index 1b35d5f..f9bd60d 100644
--- a/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/DescriptorCollectorImpl.java
@@ -5,6 +5,9 @@ package org.torproject.descriptor.impl;
 
 import org.torproject.descriptor.DescriptorCollector;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -31,6 +34,9 @@ import java.util.zip.GZIPInputStream;
 
 public class DescriptorCollectorImpl implements DescriptorCollector {
 
+  private static Logger log = LoggerFactory
+  .getLogger(DescriptorCollectorImpl.class);
+
   @Override
   public void collectDescriptors(String collecTorBaseUrl,
   String[] remoteDirectories, long minLastModified,
@@ -130,7 +136,7 @@ public class DescriptorCollectorImpl implements 
DescriptorCollector {
 br.close();
   }
 } catch (IOException e) {
-  e.printStackTrace();
+  log.error("Cannot fetch remote directory.", e);
   if (huc != null) {
 huc.disconnect();
   }
@@ -163,7 +169,7 @@ public class DescriptorCollectorImpl implements 
DescriptorCollector {
   }
   scanner.close();
 } catch (ParseException e) {
-  e.printStackTrace();
+  log.error("Cannot parse directory listing: " + directoryListing, e);
   return null;
 }
 return remoteFiles;
@@ -225,7 +231,7 @@ public class DescriptorCollectorImpl implements 
DescriptorCollector {
 destinationFile.setLastModified(lastModifiedMillis);
   }
 } catch (IOException e) {
-  e.printStackTrace();
+  log.error("Cannot fetch remote file.", e);
   if (huc != null) {
 huc.disconnect();
   }
diff --git 
a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java 
b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java
index e3c07e5..fac9475 100644
--- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java
@@ -14,6 +14,9 @@ import 
org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import 
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -34,6 +37,7 @@ import java.util.TreeMap;
 
 public class DescriptorReaderImpl implements DescriptorReader {
 
+  private static Logger log = 
LoggerFactory.getLogger(DescriptorReaderImpl.class);
   private boolean hasStartedReading = false;
 
   private List directories = new ArrayList<>();
@@ -185,12 +189,8 @@ public class DescriptorReaderImpl implements 
DescriptorReader {
 this.readTarballs();
 this.hasFinishedReading = true;
   } catch (Throwable t) {
-/* We're usually not writing to stdout or stderr, but we shouldn't
- * stay quiet about this potential bug.  If we were to switch to a
- * logging API, this would qualify as ERROR. */
-System.err.println("Bug: uncaught exception or error while "
-+ "reading descriptors:");
-t.printStackTrace();
+log.error("Bug: uncaught exception or error while "
++ "reading descriptors: " + t.getMessage(), t);
   } finally {
 this.descriptorQueue.setOutOfDescriptors();
   }
@@ -209,7 +209,7 @@ public class DescriptorReaderImpl implements 
DescriptorReader {
 String line;
 while

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

2016-08-22 Thread translation 
commit 82eb0c89837b8a6dfdbb558f70c51b55cd328121
Author: Translation commit bot 
Date:   Mon Aug 22 09:18:34 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 de/prefs.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/de/prefs.dtd b/de/prefs.dtd
index 05677f2..71e7d6e 100644
--- a/de/prefs.dtd
+++ b/de/prefs.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-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-08-22 Thread translation 
commit 0317d5c6311acfcf428fddb7f9ee40a322b69f4d
Author: Translation commit bot 
Date:   Mon Aug 22 08:49:19 2016 +

Update translations for tor-messenger-prefsdtd
---
 ach/prefs.dtd | 1 +
 ady/prefs.dtd | 1 +
 af/prefs.dtd  | 1 +
 ak/prefs.dtd  | 1 +
 am/prefs.dtd  | 1 +
 ar/prefs.dtd  | 1 +
 arn/prefs.dtd | 1 +
 ast/prefs.dtd | 1 +
 az/prefs.dtd  | 1 +
 ba/prefs.dtd  | 1 +
 be/prefs.dtd  | 1 +
 bg/prefs.dtd  | 1 +
 bn/prefs.dtd  | 1 +
 bn_BD/prefs.dtd   | 1 +
 bn_IN/prefs.dtd   | 1 +
 bo/prefs.dtd  | 1 +
 br/prefs.dtd  | 1 +
 brx/prefs.dtd | 1 +
 bs/prefs.dtd  | 1 +
 ca/prefs.dtd  | 1 +
 ceb/prefs.dtd | 1 +
 cs/prefs.dtd  | 1 +
 csb/prefs.dtd | 1 +
 cv/prefs.dtd  | 1 +
 cy/prefs.dtd  | 1 +
 da/prefs.dtd  | 1 +
 de/prefs.dtd  | 1 +
 dz/prefs.dtd  | 1 +
 el/prefs.dtd  | 1 +
 en/prefs.dtd  | 1 +
 en_GB/prefs.dtd   | 1 +
 eo/prefs.dtd  | 1 +
 es/prefs.dtd  | 1 +
 es_AR/prefs.dtd   | 1 +
 es_CL/prefs.dtd   | 1 +
 es_CO/prefs.dtd   | 1 +
 es_MX/prefs.dtd   | 1 +
 et/prefs.dtd  | 1 +
 eu/prefs.dtd  | 1 +
 fa/prefs.dtd  | 1 +
 fi/prefs.dtd  | 1 +
 fil/prefs.dtd | 1 +
 fo/prefs.dtd  | 1 +
 fr/prefs.dtd  | 1 +
 fr_CA/prefs.dtd   | 1 +
 fur/prefs.dtd | 1 +
 fy/prefs.dtd  | 1 +
 ga/prefs.dtd  | 1 +
 gd/prefs.dtd  | 1 +
 gl/prefs.dtd  | 1 +
 gu/prefs.dtd  | 1 +
 gu_IN/prefs.dtd   | 1 +
 gun/prefs.dtd | 1 +
 ha/prefs.dtd  | 1 +
 he/prefs.dtd  | 1 +
 hi/prefs.dtd  | 1 +
 hr/prefs.dtd  | 1 +
 hr_HR/prefs.dtd   | 1 +
 ht/prefs.dtd  | 1 +
 hu/prefs.dtd  | 1 +
 hy/prefs.dtd  | 1 +
 ia/prefs.dtd  | 1 +
 id/prefs.dtd  | 1 +
 is/prefs.dtd  | 1 +
 it/prefs.dtd  | 1 +
 ja/prefs.dtd  | 1 +
 jv/prefs.dtd  | 1 +
 ka/prefs.dtd  | 1 +
 kk/prefs.dtd  | 1 +
 km/prefs.dtd  | 1 +
 kn/prefs.dtd  | 1 +
 ko/prefs.dtd  | 1 +
 ko_KR/prefs.dtd   | 1 +
 ku/prefs.dtd  | 1 +
 ku_IQ/prefs.dtd   | 1 +
 kw/prefs.dtd  | 1 +
 ky/prefs.dtd  | 1 +
 la/prefs.dtd  | 1 +
 lb/prefs.dtd  | 1 +
 lg/prefs.dtd  | 1 +
 ln/prefs.dtd  | 1 +
 lo/prefs.dtd  | 1 +
 lt/prefs.dtd  | 1 +
 lv/prefs.dtd  | 1 +
 mg/prefs.dtd  | 1 +
 mi/prefs.dtd  | 1 +
 mk/prefs.dtd  | 1 +
 ml/prefs.dtd  | 1 +
 mn/prefs.dtd  | 1 +
 mr/prefs.dtd  | 1 +
 ms_MY/prefs.dtd   | 1 +
 mt/prefs.dtd  | 1 +
 my/prefs.dtd  | 1 +
 nah/prefs.dtd | 1 +
 nap/prefs.dtd | 1 +
 nb/prefs.dtd  | 1 +
 nds/prefs.dtd | 1 +
 ne/prefs.dtd  | 1 +
 nl/prefs.dtd  | 1 +
 nl_BE/prefs.dtd   | 1 +
 nn/prefs.dtd  | 1 +
 nso/prefs.dtd | 1 +
 oc/prefs.dtd  | 1 +
 or/prefs.dtd  | 1 +
 pa/prefs.dtd  | 1 +
 pap/prefs.dtd | 1 +
 pl/prefs.dtd  | 1 +
 pms/prefs.dtd | 1 +
 ps/prefs.dtd  | 1 +
 pt/prefs.dtd  | 1 +
 pt_BR/prefs.dtd   | 1 +
 ro/prefs.dtd  | 1 +
 ru/prefs.dtd  | 1 +
 ru@petr1708/prefs.dtd | 1 +
 scn/prefs.dtd | 1 +
 sco/prefs.dtd | 1 +
 si_LK/prefs.dtd   | 1 +
 sk/prefs.dtd  | 1 +
 sk_SK/prefs.dtd   | 1 +
 sl/prefs.dtd  | 1 +
 sl_SI/prefs.dtd   | 1 +
 sn/prefs.dtd  | 1 +
 so/prefs.dtd  | 1 +
 son/prefs.dtd | 1 +
 sq/prefs.dtd  | 1 +
 sr/prefs.dtd  | 1 +
 sr@latin/prefs.dtd| 1 +
 st/prefs.dtd  | 1 +
 su/prefs.dtd  | 1 +
 sv/prefs.dtd  | 1 +
 sw/prefs.dtd  | 1 +
 szl/prefs.dtd | 1 +
 ta/prefs.dtd  | 1 +
 te/prefs.dtd  | 1 +
 te_IN/prefs.dtd   | 1 +
 tg/prefs.dtd  | 1 +
 th/prefs.dtd  | 1 +
 ti/prefs.dtd  | 1 +
 tk/prefs.dtd  | 1 +
 tr/prefs.dtd  | 1 +
 tzm/prefs.dtd | 1 +
 ug@Arab/prefs.dtd | 1 +
 uk/prefs.dtd  | 1 +
 ur/prefs.dtd  | 1 +
 ur_PK/prefs.dtd   | 1 +
 uz/prefs.dtd  | 1 +
 ve/prefs.dtd  | 1 +
 vi/prefs.dtd  | 1 +
 wa/prefs.dtd  | 1 +
 wo/prefs.dtd  | 1 +
 yo/prefs.dtd  | 1 +
 zh_CN/prefs.dtd   | 1 +
 zh_HK/prefs.dtd   | 1 +
 zh_TW/prefs.dtd   | 1 +
 zu/prefs.dtd  | 1 +
 155 files changed, 155 insertions(+)

diff --git a/ach/prefs.dtd b/ach/prefs.dtd
index 1441b0e..cb930f3 100644
--- a/ach/prefs.dtd
+++ b/ach/prefs.dtd
@@ -1,4 +1,5 @@
 
+
 
 
 
diff --git a/ady/prefs.dtd b/ady/prefs.dtd
index 1441b0e..cb930f3 100644
--- a/ady/prefs.dtd
+++ b/ady/prefs.dtd
@@ -1,4

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

2016-08-22 Thread translation 
commit 348180fd8c54786c17687faafc37b3962816f0b2
Author: Translation commit bot 
Date:   Mon Aug 22 08:49:33 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 en/prefs.dtd | 1 +
 lv/prefs.dtd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/en/prefs.dtd b/en/prefs.dtd
index 1441b0e..cb930f3 100644
--- a/en/prefs.dtd
+++ b/en/prefs.dtd
@@ -1,4 +1,5 @@
 
+
 
 
 
diff --git a/lv/prefs.dtd b/lv/prefs.dtd
index a83b014..6427378 100644
--- a/lv/prefs.dtd
+++ b/lv/prefs.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] [metrics-lib/master] Include resources in tarball.

2016-08-22 Thread karsten 
commit 2ef622a0d36459fb16116c3d0b247a9bdd02ab2f
Author: Karsten Loesing 
Date:   Thu Aug 11 11:48:18 2016 +0200

Include resources in tarball.

Implements #19893.
---
 build.xml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index e581578..bb48dde 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,6 @@
 
   
+  
   
   
   
@@ -244,10 +245,8 @@
 
 
   
-  
-  
+  
   
 

___
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.1.0-dev, once more.

2016-08-22 Thread karsten 
commit 7ae84f201e57a79a81dd7e64f3b99222b178eea8
Author: Karsten Loesing 
Date:   Mon Aug 22 10:06:23 2016 +0200

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

diff --git a/build.xml b/build.xml
index 5ad2b25..1e292b7 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 
-  
+  
   
   
   

___
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.0.1 release.

2016-08-22 Thread karsten 
commit fc3e12eecc6f75ffb95cb1e6d5885c59374f208b
Author: Karsten Loesing 
Date:   Mon Aug 22 09:30:37 2016 +0200

Prepare for 1.0.1 release.
---
 CHANGELOG.md | 8 
 build.xml| 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f9b2b2..931f29a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Changes in version 1.0.1 - 2016-08-22
+
+ * Medium changes
+   - Avoid running out of memory when executing the relaydescs module
+ repeatedly from the internal scheduler rather than using the
+ system's cron daemon.
+
+
 # Changes in version 1.0.0 - 2016-08-11
 
  * Major changes
diff --git a/build.xml b/build.xml
index 1e292b7..5ad2b25 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 
-  
+  
   
   
   



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

[tor-commits] [collector/master] Solves task-19913: clean-up after each ArchiveWriter run.

2016-08-22 Thread karsten 
commit e43626580a5fea82619108c4dc22a291b94e59c2
Author: iwakeh 
Date:   Sat Aug 13 15:00:56 2016 +0200

Solves task-19913: clean-up after each ArchiveWriter run.
---
 .../org/torproject/collector/relaydescs/ArchiveWriter.java   | 12 
 1 file changed, 12 insertions(+)

diff --git 
a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java 
b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java
index 142d05b..59b7969 100644
--- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java
+++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java
@@ -195,6 +195,18 @@ public class ArchiveWriter extends CollecTorMain {
 new File(statsDir, "references"),
 new File(statsDir, "references-history")).check();
 CollecTorMain.checkAvailableSpace(recentPath);
+cleanUp();
+  }
+
+  private void cleanUp() {
+this.expectedVotes.clear();
+this.intermediateStats = new StringBuilder();
+this.storedConsensuses.clear();
+this.storedMicrodescConsensuses.clear();
+this.storedVotes.clear();
+this.storedServerDescriptors.clear();
+this.storedExtraInfoDescriptors.clear();
+this.storedMicrodescriptors.clear();
   }
 
   private void loadDescriptorDigests() {



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