date:20180803

[tor-commits] [stem/master] Python3 compatability for tests

2018-08-03 Thread atagar

commit b0c84477c5c18b0db7d60f0db6cc42cb9c0948e5
Author: Damian Johnson 
Date:   Fri Aug 3 12:42:29 2018 -0700

Python3 compatability for tests

Couple regressions that mostly slipped in with the recent hashing changes.

  https://trac.torproject.org/projects/tor/ticket/27030
---
 stem/client/datatype.py   | 7 +++
 test/unit/client/link_protocol.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/stem/client/datatype.py b/stem/client/datatype.py
index 4859e24a..32295317 100644
--- a/stem/client/datatype.py
+++ b/stem/client/datatype.py
@@ -349,6 +349,7 @@ class Size(Field):
 self.name = name
 self.size = size
 self.format = pack_format
+self._hash = None
 
   @staticmethod
   def pop(packed):
@@ -376,6 +377,12 @@ class Size(Field):
 
 return self.unpack(to_unpack), remainder
 
+  def __hash__(self):
+if self._hash is None:
+  self._hash = stem.util._hash_attr(self, 'name', 'size', 'format')
+
+return self._hash
+
 
 class Address(Field):
   """
diff --git a/test/unit/client/link_protocol.py 
b/test/unit/client/link_protocol.py
index ffaa30c2..e7fbdb00 100644
--- a/test/unit/client/link_protocol.py
+++ b/test/unit/client/link_protocol.py
@@ -30,7 +30,7 @@ class TestLinkProtocol(unittest.TestCase):
 self.assertEqual(7, protocol + 2)
 self.assertEqual(3, protocol - 2)
 self.assertEqual(15, protocol * 3)
-self.assertEqual(1, protocol / 3)
+self.assertEqual(1, protocol // 3)
 
   def test_equality(self):
 # LinkProtocols should be comparable with both other LinkProtocols and

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

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2018-08-03 Thread translation

commit aee0906968de475b6030c9b06894104664eee97c
Author: Translation commit bot 
Date:   Fri Aug 3 15:17:09 2018 +

Update translations for tor-launcher-network-settings_completed
---
 pt_BR/network-settings.dtd | 2 +-
 tr/network-settings.dtd| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 6b6dfe914..98e152a76 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 
diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index 74a24e015..55e1244de 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 

___
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

2018-08-03 Thread translation

commit bcdc07e2db660d76f2425fa6bac0cbeda9917daf
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:53 2018 +

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

diff --git a/ml/progress.dtd b/ml/progress.dtd
index 9ac9ad74f..c95f3ac5c 100644
--- a/ml/progress.dtd
+++ b/ml/progress.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

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

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

2018-08-03 Thread translation

commit 9c126a15c78c468e944f421eee51dd298da8b4e8
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:43 2018 +

Update translations for tor-launcher-properties
---
 fa/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties
index e8d9a301e..533c4918d 100644
--- a/fa/torlauncher.properties
+++ b/fa/torlauncher.properties
@@ -1,7 +1,7 @@
 ### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Ø§Ø¬Ø±Ø§ Ú©ÙÙØ¯Ù ØªÙØ±
+torlauncher.error_title=Ø§Ø¬Ø±Ø§Ú©ÙÙØ¯Ù ØªÙØ±
 
 torlauncher.tor_exited_during_startup=ØªÙØ± Ø¯Ø± ÙÙÚ¯Ø§Ù Ø´Ø±ÙØ¹ Ø¨Ø³ØªÙ 
Ø´Ø¯. ÙÙÚ©Ù Ø§Ø³Øª Ø§ÛÙ Ø¨Ø¹ÙØª Ø®Ø·Ø§ÛÛ Ø¯Ø± ÙØ§ÛÙ torrc Ø´ÙØ§Ø 
Ø®Ø·Ø§ÛÛ Ø¯Ø± Ø¨Ø±ÙØ§ÙÙ ØªÙØ± ØªØ§ Ø¨Ø±ÙØ§ÙÙ Ø¯ÛÚ¯Ø±Û Ø±ÙÛ Ú©Ø§Ù
Ù¾ÛÙØªØ± Ø´ÙØ§Ø Ù ÛØ§ Ø§ÛØ±Ø§Ø¯ Ø³Ø®Øª Ø§ÙØ²Ø§Ø±Û Ø¨Ø§Ø´Ø¯. ØªØ§ Ø²Ù
Ø§ÙÛ Ú©Ù Ø´ÙØ§ Ø®Ø·Ø§Û Ø±Ø® Ø¯Ø§Ø¯Ù Ø±Ø§ Ø¨Ø±Ø±Ø³Û Ø±ÙØ¹ Ú©ÙÛØ¯ Ù 
ØªÙØ± Ø±Ø§ Ø¯ÙØ¨Ø§Ø±Ù Ø§Ø¬Ø±Ø§ Ú©ÙÛØ¯Ø ÙØ±ÙØ±Ú¯Ø± ØªÙØ± Ø´Ø±ÙØ¹ 
ÙØ®ÙØ§ÙØ¯ Ø´Ø¯.
 torlauncher.tor_exited=Tor Ø¨Ù Ø·ÙØ± ØºÛØ± ÙÙØªØ¸Ø±Ù Ø®Ø§Ø±Ø¬ Ø´Ø¯ Ú©Ù 
Ø§ÛÙ ÙÙÚ©Ù Ø§Ø³Øª Ø¨Ù Ø¹ÙØª ÛÚ© Ø§Ø´Ú©Ø§Ù Ø¯Ø± Tor Ù ÛØ§ ÛÚ© 
Ø¨Ø±ÙØ§ÙÙ Ø¯ÛÚ¯Ø± Ø¨Ø± Ø±ÙÛ Ø³ÛØ³ØªÙ Ø´ÙØ§ Ù ÛØ§ ÛÚ© Ø³Ø®Øª 
Ø§ÙØ²Ø§Ø± ÙØ¹ÛÙØ¨ Ø§ØªÙØ§Ù Ø§ÙØªØ§Ø¯Ù Ø¨Ø§Ø´Ø¯Ø ØªØ§ Ø²ÙØ§ÙÛ Ú©Ù 
Ø¯ÙØ¨Ø§Ø±Ù Tor Ø±Ø§ Ø§Ø¬Ø±Ø§ ÙÙØ§Ø¦ÛØ¯ ÙØ±ÙØ±Ú¯Ø± Tor ÙØ§Ø¯Ø± 
ÙØ®ÙØ§ÙØ¯ Ø¨ÙØ¯ Ø¨Ù ÙÛÚ Ø³Ø§ÛØªÛ Ø¯Ø³ØªØ±Ø³Û Ø¯Ø§Ø´ØªÙ Ø¨Ø§Ø´Ø¯. 
Ø§Ú¯Ø± Ø§ÛÙ ÙØ´Ú©Ù Ø§Ø¯Ø§ÙÙ Ø¯Ø§Ø´ØªØ ÙØ·ÙØ§ ÛÚ© Ú©Ù¾Û Ø§Ø² Log Tor 
Ø®ÙØ¯ Ø±Ø§ Ø¨Ù ØªÛÙ Ù¾Ø´ØªÛØ¨Ø§ÙÛ Ø§Ø±Ø³Ø§Ù Ú©ÙÛØ¯.

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-08-03 Thread translation

commit a5718cce54b975482f37b93470610b9b4c966296
Author: Translation commit bot 
Date:   Fri Aug 3 15:17:04 2018 +

Update translations for tor-launcher-network-settings
---
 ml/network-settings.dtd| 6 +++---
 pt_BR/network-settings.dtd | 2 +-
 tr/network-settings.dtd| 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd
index 03e0c8374..c1bb23bf3 100644
--- a/ml/network-settings.dtd
+++ b/ml/network-settings.dtd
@@ -1,6 +1,6 @@
-
-
-
+
+
+
 
 
 
diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index d70b128e3..98e152a76 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 
diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index 8aad8c97b..55e1244de 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 

___
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

2018-08-03 Thread translation

commit fee178119697f5023181fa0acd2359e39e854092
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:33 2018 +

Update translations for mat-gui
---
 ml.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ml.po b/ml.po
index 86bb8c89c..225736324 100644
--- a/ml.po
+++ b/ml.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# NITHIN S SABU , 2018
 msgid ""
 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: 2018-02-20 18:56+\n"
-"Last-Translator: Nandakumar \n"
+"PO-Revision-Date: 2018-08-02 17:39+\n"
+"Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: mat-gui:66 mat-gui:422 mat-gui:445
 msgid "Ready"
-msgstr ""
+msgstr "à´¤à´¯àµà´¯à´¾à´±à´¾à´¯à´¿ !"
 
 #: mat-gui:136
 msgid "Choose files"

___
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

2018-08-03 Thread translation

commit e92a668baeb26e6a3674c5376fd87c0df4b26188
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:28 2018 +

Update translations for torbirdy_completed
---
 fr/torbirdy.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties
index df5832fa6..e5afa7f04 100644
--- a/fr/torbirdy.properties
+++ b/fr/torbirdy.properties
@@ -14,5 +14,5 @@ torbirdy.email.advanced=Veuillez noter quâil nâest PAS 
recommandÃ© de modifi
 torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine 
fois
 torbirdy.email.advanced.title=ParamÃ¨tres Ã©voluÃ©s de TorBirdy
 
-torbirdy.firstrun=TorBirdy est maintenant en cours dâexÃ©cution.\n\nPour 
vous aider Ã  protÃ©ger votre anonymat, TorBirdy va appliquer les paramÃ¨tres 
de Thunderbird quâil a configurÃ©, les empÃªchant dâÃªtre modifiÃ©s par 
vous ou tout autre module complÃ©mentaire. Certains paramÃ¨tres peuvent Ãªtre 
changÃ©s et sont accessibles par le biais de la boÃ®te de dialogue de TorBirdy. 
Lorsque TorBirdy est dÃ©sinstallÃ© ou dÃ©sactivÃ©, tous les paramÃ¨tres quâil 
a modifiÃ© sont rÃ©initialisÃ©s Ã  leur valeur par dÃ©faut (valeurs avant 
lâinstallation de TorBirdy).\n\nSi vous Ãªtes un nouvel utilisateur, il vous 
est conseillÃ© de lire le site Internet de TorBirdy afin de comprendre ce que 
nous essayons dâaccomplir avec TorBirdy, pour nos utilisateurs.
+torbirdy.firstrun=TorBirdy est maintenant en cours dâexÃ©cution.\n\nPour 
vous aider Ã  protÃ©ger votre anonymat, TorBirdy va appliquer les paramÃ¨tres 
de Thunderbird quâil a configurÃ©, les empÃªchant dâÃªtre modifiÃ©s par 
vous ou tout autre module complÃ©mentaire. Certains paramÃ¨tres peuvent Ãªtre 
changÃ©s et sont accessibles par le biais de la boÃ®te de dialogue de TorBirdy. 
Quand TorBirdy est dÃ©sinstallÃ© ou dÃ©sactivÃ©, tous les paramÃ¨tres quâil a 
modifiÃ© sont rÃ©initialisÃ©s Ã  leur valeur par dÃ©faut (valeurs avant 
lâinstallation de TorBirdy).\n\nSi vous Ãªtes un nouvel utilisateur, il vous 
est conseillÃ© de lire le site Internet de TorBirdy afin de comprendre ce que 
nous essayons dâaccomplir avec TorBirdy, pour nos utilisateurs.
 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/torbirdy] Update translations for torbirdy

2018-08-03 Thread translation

commit 957cc892fd302e984d50d21c7e7202b6e5fa8de0
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:21 2018 +

Update translations for torbirdy
---
 fr/torbirdy.properties | 2 +-
 ml/torbirdy.dtd| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties
index df5832fa6..e5afa7f04 100644
--- a/fr/torbirdy.properties
+++ b/fr/torbirdy.properties
@@ -14,5 +14,5 @@ torbirdy.email.advanced=Veuillez noter quâil nâest PAS 
recommandÃ© de modifi
 torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine 
fois
 torbirdy.email.advanced.title=ParamÃ¨tres Ã©voluÃ©s de TorBirdy
 
-torbirdy.firstrun=TorBirdy est maintenant en cours dâexÃ©cution.\n\nPour 
vous aider Ã  protÃ©ger votre anonymat, TorBirdy va appliquer les paramÃ¨tres 
de Thunderbird quâil a configurÃ©, les empÃªchant dâÃªtre modifiÃ©s par 
vous ou tout autre module complÃ©mentaire. Certains paramÃ¨tres peuvent Ãªtre 
changÃ©s et sont accessibles par le biais de la boÃ®te de dialogue de TorBirdy. 
Lorsque TorBirdy est dÃ©sinstallÃ© ou dÃ©sactivÃ©, tous les paramÃ¨tres quâil 
a modifiÃ© sont rÃ©initialisÃ©s Ã  leur valeur par dÃ©faut (valeurs avant 
lâinstallation de TorBirdy).\n\nSi vous Ãªtes un nouvel utilisateur, il vous 
est conseillÃ© de lire le site Internet de TorBirdy afin de comprendre ce que 
nous essayons dâaccomplir avec TorBirdy, pour nos utilisateurs.
+torbirdy.firstrun=TorBirdy est maintenant en cours dâexÃ©cution.\n\nPour 
vous aider Ã  protÃ©ger votre anonymat, TorBirdy va appliquer les paramÃ¨tres 
de Thunderbird quâil a configurÃ©, les empÃªchant dâÃªtre modifiÃ©s par 
vous ou tout autre module complÃ©mentaire. Certains paramÃ¨tres peuvent Ãªtre 
changÃ©s et sont accessibles par le biais de la boÃ®te de dialogue de TorBirdy. 
Quand TorBirdy est dÃ©sinstallÃ© ou dÃ©sactivÃ©, tous les paramÃ¨tres quâil a 
modifiÃ© sont rÃ©initialisÃ©s Ã  leur valeur par dÃ©faut (valeurs avant 
lâinstallation de TorBirdy).\n\nSi vous Ãªtes un nouvel utilisateur, il vous 
est conseillÃ© de lire le site Internet de TorBirdy afin de comprendre ce que 
nous essayons dâaccomplir avec TorBirdy, pour nos utilisateurs.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ml/torbirdy.dtd b/ml/torbirdy.dtd
index 1c06e1993..c73fbcce1 100644
--- a/ml/torbirdy.dtd
+++ b/ml/torbirdy.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-08-03 Thread translation

commit 7f5fea4589e1e9440620be8dda92c1f7664a88d3
Author: Translation commit bot 
Date:   Fri Aug 3 15:16:09 2018 +

Update translations for tails-persistence-setup
---
 ml/ml.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ml/ml.po b/ml/ml.po
index 24b90f70e..9ae90065b 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# NITHIN S SABU , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-02-20 18:51+\n"
-"Last-Translator: Balasankar C \n"
+"PO-Revision-Date: 2018-08-02 17:38+\n"
+"Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:48
 msgid "Personal Data"
-msgstr ""
+msgstr "à´µàµà´¯à´àµà´¤à´¿à´ªà´°à´®à´¾à´¯ à´µà´¿à´µà´°à´àµà´àµ¾ "
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:50
 msgid "Keep files stored in the `Persistent' directory"

___
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

2018-08-03 Thread translation

commit 26b08f99b957645ad954906408e6c4b27cfdfd20
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:42 2018 +

Update translations for https_everywhere
---
 ml/https-everywhere.dtd|  4 ++--
 ml/https-everywhere.properties |  2 +-
 ml/ssl-observatory.dtd |  4 ++--
 pa/https-everywhere.dtd| 18 +-
 pa/https-everywhere.properties | 12 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ml/https-everywhere.dtd b/ml/https-everywhere.dtd
index 29e107c92..40c7fa5e5 100644
--- a/ml/https-everywhere.dtd
+++ b/ml/https-everywhere.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -38,4 +38,4 @@
 
 
 
-
+
diff --git a/ml/https-everywhere.properties b/ml/https-everywhere.properties
index 8b0422fc9..04da67fb7 100644
--- a/ml/https-everywhere.properties
+++ b/ml/https-everywhere.properties
@@ -1,6 +1,6 @@
 https-everywhere.menu.globalEnable = à´à´²àµà´²à´¾à´¯à´¿à´à´¤àµà´¤àµà´ 
à´à´àµà´àµà´à´¿à´à´¿à´ªà´¿à´à´¸àµ 
à´ªàµà´°à´¾à´ªàµà´¤à´®à´¾à´àµà´àµà´
 https-everywhere.menu.globalDisable = à´à´²àµà´²à´¾à´¯à´¿à´à´¤àµà´¤àµà´ 
à´à´àµà´àµà´à´¿à´à´¿à´ªà´¿à´à´¸àµ à´ªàµà´°à´µà´°àµâà´¤àµà´¤à´¨ 
à´°à´¹à´¿à´¤à´®à´¾à´àµà´àµà´
-https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.enableDisable = à´µàµà´¯à´µà´¸àµâà´¥à´àµ¾ 
à´ªàµà´°à´¾à´ªàµà´¤à´®à´¾à´àµà´àµà´ / à´à´¸à´¾à´§àµà´µà´¾à´àµà´àµ 
 https-everywhere.menu.noRules = (No Rules for This Page)
 https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
 https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle 
it on a site-by-site basis by clicking the icon in the address bar.
diff --git a/ml/ssl-observatory.dtd b/ml/ssl-observatory.dtd
index f53cd36a3..9dc80014c 100644
--- a/ml/ssl-observatory.dtd
+++ b/ml/ssl-observatory.dtd
@@ -1,6 +1,6 @@
 
-
-
+
+
 
 
 
 
 
-
+
 
 
 
@@ -12,13 +12,13 @@
 
 
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
@@ -28,14 +28,14 @@
 
 
 
-
-
-
+
+
+
 
 
 
 
 
 
-
+
 
diff --git a/pa/https-everywhere.properties b/pa/https-everywhere.properties
index b04ac1181..4f4c2f45e 100644
--- a/pa/https-everywhere.properties
+++ b/pa/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸. 
à¨à¨µà¨°à©à¨µà©à¨à¨° à¨à¨¾à¨²à© à¨à¨°à©
 https-everywhere.menu.globalDisable = 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸. à¨à¨µà¨°à©à¨µà©à¨à¨° à¨¬à©°à¨¦ 
à¨à¨°à©
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle 
it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial 
fix, this update resets your HTTPS Everywhere rule preferences to their default 
values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
+https-everywhere.menu.enableDisable = à¨¯à©à¨ / à¨à¨¸à¨®à¨°à¨¥ à¨¨à¨¿à¨¯à¨®
+https-everywhere.menu.noRules = (à¨à¨¸ à¨ªà©°à¨¨à© à¨²à¨ à¨à©à¨ 
à¨¨à¨¿à¨¯à¨® à¨¨à¨¹à©à¨)
+https-everywhere.menu.unknownRules = (à¨à¨¸ à¨ªà©à¨à¨¼ à¨²à¨ à¨¨à¨¿à¨¯à¨® 
à¨à¨£à¨à¨¾à¨£ à¨¹à¨¨)
+https-everywhere.toolbar.hint = à¨¹à¨° à¨à¨à©à¨¹à¨¾ 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ à¨¹à©à¨£ à¨à¨¿à¨°à¨¿à¨à¨¸à¨¼à©à¨² 
à¨¹à©. à¨¤à©à¨¸à©à¨ à¨à¨¸ à¨¨à©à©° à¨ªà¨¤à¨¾-à¨¬à¨¾à¨° à¨¦à© 
à¨à¨à¨à©à¨¨ à¨¨à©à©° à¨à¨²à¨¿à©±à¨ à¨à¨°à¨à© 
à¨¸à¨¾à¨à¨-à¨¤à©-à¨¸à¨¾à¨à¨ à¨à¨§à¨¾à¨° à¨¤à© à¨¬à¨¦à¨² à¨¸à¨à¨¦à© 
à¨¹à©.
+https-everywhere.migration.notification0 = à¨à©±à¨ 
à¨®à¨¹à©±à¨¤à¨µà¨ªà©à¨°à¨¨ à¨«à¨¿à¨à¨¸ à¨¨à©à©° à¨²à¨¾à¨à© à¨à¨°à¨¨ 
à¨²à¨, à¨à¨¹ à¨à¨ªà¨¡à©à¨ à¨¤à©à¨¹à¨¾à¨¡à©à¨à¨ 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ à¨¦à© à¨¹à¨° à¨¥à¨¾à¨ à¨¨à¨¿à¨¯à¨® 
à¨ªà¨¸à©°à¨¦ à¨¨à©à©° à¨à¨¨à©à¨¹à¨¾à¨ à¨¦à© à¨¡à¨¿à¨«à¨¾à¨²à¨ 
à¨®à©à©±à¨²à¨¾à¨ à¨¤à© à¨¦à©à¨¬à¨¾à¨°à¨¾ à¨¸à©à¨ à¨à¨°à¨¦à¨¾ à¨¹à©.
+https-everywhere.menu.ruleset-tests =  à¨¹à¨° à¨à¨à©à¨¹à¨¾ 
à¨°à©à¨²à¨¸à©à©±à¨ à¨à©à¨¸à¨ à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ 
à¨à¨²à¨¾à¨

___
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

2018-08-03 Thread translation

commit 77c5c169aff3cd67c037be757dcda6682fb01180
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:57 2018 +

Update translations for liveusb-creator
---
 ml/ml.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ml/ml.po b/ml/ml.po
index 20687f913..bcdeffee9 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# NITHIN S SABU , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2018-02-20 18:53+\n"
-"Last-Translator: gkns \n"
+"PO-Revision-Date: 2018-08-02 17:56+\n"
+"Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../tails_installer/creator.py:101
 msgid "You must run this application as root"
-msgstr ""
+msgstr "à´ à´à´ªàµà´ªàµà´²à´¿à´àµà´àµà´·àµ» à´±àµà´àµà´à´¾à´¯à´¿ 
à´®à´¾à´¤àµà´°à´ à´ªàµà´°à´µàµ¼à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´àµà´àµ "
 
 #: ../tails_installer/creator.py:147
 msgid "Extracting live image to the target device..."

___
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

2018-08-03 Thread translation

commit 8aee31607185632740866204925256de0dceaf74
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:03 2018 +

Update translations for bridgedb
---
 bn_BD/LC_MESSAGES/bridgedb.po | 381 ++
 1 file changed, 381 insertions(+)

diff --git a/bn_BD/LC_MESSAGES/bridgedb.po b/bn_BD/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0..e85914454
--- /dev/null
+++ b/bn_BD/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,381 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2015 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+# 
+# Translators:
+# Al Shahrior Hasan Sagor , 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2017-11-19 11:34+\n"
+"Last-Translator: Al Shahrior Hasan Sagor \n"
+"Language-Team: Bengali (Bangladesh) 
(http://www.transifex.com/otf/torproject/language/bn_BD/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Language: bn_BD\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/https/server.py:167
+msgid "Sorry! Something went wrong with your request."
+msgstr "à¦¦à§à¦à¦à¦¿à¦¤! à¦à¦ªà¦¨à¦¾à¦° à¦à¦¨à§à¦°à§à¦§à§ à¦à¦¿à¦à§ 
à¦à§à¦² à¦¹à¦¯à¦¼à§à¦à§à¥¤"
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "à¦à¦à¦à¦¿ à¦¤à§à¦°à§à¦à¦¿ à¦°à¦¿à¦ªà§à¦°à§à¦ à¦à¦°à§à¦¨"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "à¦¸à§à¦°à§à¦¸ à¦à§à¦¡"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦£à§à¦°"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "à¦¯à§à¦à¦¾à¦¯à§à¦"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à¦¸à¦¬ à¦¨à¦¿à¦°à§à¦¬à¦¾à¦à¦¨ à¦à¦°à§à¦¨"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR à¦à§à¦¡ à¦¦à§à¦à§à¦¨"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "à¦à¦ªà¦¨à¦¾à¦° à¦¬à§à¦°à¦¿à¦ à¦²à¦¾à¦à¦¨ à¦à¦¨à§à¦¯ QR à¦à§à¦¡"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "à¦à¦¹, à¦¸à§à¦ªà§à¦¯à¦¾à¦à§à¦à¦¿à¦¸!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "à¦®à¦¨à§ à¦¹à¦à§à¦à§ à¦à¦ªà¦¨à¦¾à¦° QR à¦à§à¦¡ à¦ªà§à¦¤à§ 
à¦à¦à¦à¦¿ à¦¤à§à¦°à§à¦à¦¿ à¦à¦¿à¦²à¥¤"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "à¦à¦ QR à¦à§à¦¡à¦à¦¿à¦¤à§ à¦à¦ªà¦¨à¦¾à¦° à¦¬à§à¦°à¦¿à¦ 
à¦²à¦¾à¦à¦¨ à¦°à¦¯à¦¼à§à¦à§à¥¤ à¦®à§à¦¬à¦¾à¦à¦² à¦à¦¬à¦ à¦
à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦¡à¦¿à¦à¦¾à¦à¦¸à¦à§à¦²à¦¿à¦¤à§ à¦à¦ªà¦¨à¦¾à¦° 
à¦¬à§à¦°à¦¿à¦ à¦²à¦¾à¦à¦¨ à¦à¦ªà¦¿ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯ à¦à¦à¦¿ QR 
à¦à§à¦¡à¦à¦¿ à¦¸à§à¦à§à¦¯à¦¾à¦¨ à¦à¦°à§à¦¨à¥¤"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "à¦¬à¦°à§à¦¤à¦®à¦¾à¦¨à§ à¦à§à¦¨ à¦¬à§à¦°à¦¿à¦ à¦¨à§à¦ ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à¦¸à¦®à§à¦à¦¬à¦¤ %s à¦à¦ªà¦¨à¦¿ à¦«à¦¿à¦°à§ %s à¦à¦¬à¦ 
à¦à¦à¦à¦¿ à¦à¦¿à¦¨à§à¦¨ à¦¬à§à¦°à¦¿à¦ à¦ªà§à¦°à¦à¦¾à¦° 
à¦¨à¦¿à¦°à§à¦¬à¦¾à¦à¦¨ à¦à¦°à¦¾ à¦à¦à¦¿à¦¤!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "à¦§à¦¾à¦ª %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "à¦¡à¦¾à¦à¦¨à¦²à§à¦¡ %s à¦à¦° à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦° %s "
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "à¦§à¦¾à¦ª %s 2 %s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "à¦à§à¦ %s à¦¬à§à¦°à¦¿à¦  %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "à¦§à¦¾

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

2018-08-03 Thread translation

commit 393dacb966b9074c9eb65d286f100599e4a1f253
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:16 2018 +

Update translations for torcheck
---
 ml/torcheck.po | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ml/torcheck.po b/ml/torcheck.po
index c9576d6e1..62233612d 100644
--- a/ml/torcheck.po
+++ b/ml/torcheck.po
@@ -2,13 +2,14 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# NITHIN S SABU , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-02-14 08:38+\n"
-"Last-Translator: runasand \n"
-"Language-Team: Malayalam 
(http://www.transifex.com/projects/p/torproject/language/ml/)\n"
+"PO-Revision-Date: 2018-08-02 17:06+\n"
+"Last-Translator: NITHIN S SABU \n"
+"Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
-msgstr ""
+msgstr "à´à´à´¿à´¨à´¨àµà´¦à´¨à´àµà´àµ¾ , à´ à´¬àµà´°àµà´¸àµ¼ 
à´àµàµ¼ à´à´ªà´¯àµà´à´¿à´àµà´à´¾àµ» à´ªàµà´°à´¾à´ªàµà´¤à´®à´¾à´£àµ ."
 
 msgid ""
 "Please refer to the https://www.torproject.org/\";>Tor website "
@@ -34,7 +35,7 @@ msgid ""
 msgstr ""
 
 msgid "Sorry. You are not using Tor."
-msgstr ""
+msgstr "à´¶àµà´°à´¦àµà´§à´¿à´àµà´àµ, à´¤à´¾à´àµà´àµ¾ 
à´à´ªàµà´ªàµàµ¾ à´àµàµ¼ 
à´à´ªà´¯àµà´à´¿à´àµà´àµà´¨àµà´¨à´¿à´²àµà´² . "
 
 msgid ""
 "If you are attempting to use a Tor client, please refer to the ___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2018-08-03 Thread translation

commit d8c8735a57f7b8c2cb436a1103a08f14262c1973
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:26 2018 +

Update translations for whisperback
---
 ml/ml.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ml/ml.po b/ml/ml.po
index 0ac027f0d..157d898b1 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# NITHIN S SABU , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-04-12 18:55+\n"
-"Last-Translator: Vinu Felix \n"
+"PO-Revision-Date: 2018-08-02 17:33+\n"
+"Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 #: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
-msgstr ""
+msgstr "à´¤àµà´±àµà´±à´¾à´¯ à´-à´®àµà´¯à´¿àµ½: 1%s"
 
 #: ../whisperBack/whisperback.py:73
 #, python-format

___
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

2018-08-03 Thread translation

commit 3dbab772b412be316c4c8301b813ca885b7eef89
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:50 2018 +

Update translations for https_everywhere_completed
---
 pa/https-everywhere.properties | 8 
 1 file changed, 8 insertions(+)

diff --git a/pa/https-everywhere.properties b/pa/https-everywhere.properties
new file mode 100644
index 0..4f4c2f45e
--- /dev/null
+++ b/pa/https-everywhere.properties
@@ -0,0 +1,8 @@
+https-everywhere.menu.globalEnable = à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸. 
à¨à¨µà¨°à©à¨µà©à¨à¨° à¨à¨¾à¨²à© à¨à¨°à©
+https-everywhere.menu.globalDisable = 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸. à¨à¨µà¨°à©à¨µà©à¨à¨° à¨¬à©°à¨¦ 
à¨à¨°à©
+https-everywhere.menu.enableDisable = à¨¯à©à¨ / à¨à¨¸à¨®à¨°à¨¥ à¨¨à¨¿à¨¯à¨®
+https-everywhere.menu.noRules = (à¨à¨¸ à¨ªà©°à¨¨à© à¨²à¨ à¨à©à¨ 
à¨¨à¨¿à¨¯à¨® à¨¨à¨¹à©à¨)
+https-everywhere.menu.unknownRules = (à¨à¨¸ à¨ªà©à¨à¨¼ à¨²à¨ à¨¨à¨¿à¨¯à¨® 
à¨à¨£à¨à¨¾à¨£ à¨¹à¨¨)
+https-everywhere.toolbar.hint = à¨¹à¨° à¨à¨à©à¨¹à¨¾ 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ à¨¹à©à¨£ à¨à¨¿à¨°à¨¿à¨à¨¸à¨¼à©à¨² 
à¨¹à©. à¨¤à©à¨¸à©à¨ à¨à¨¸ à¨¨à©à©° à¨ªà¨¤à¨¾-à¨¬à¨¾à¨° à¨¦à© 
à¨à¨à¨à©à¨¨ à¨¨à©à©° à¨à¨²à¨¿à©±à¨ à¨à¨°à¨à© 
à¨¸à¨¾à¨à¨-à¨¤à©-à¨¸à¨¾à¨à¨ à¨à¨§à¨¾à¨° à¨¤à© à¨¬à¨¦à¨² à¨¸à¨à¨¦à© 
à¨¹à©.
+https-everywhere.migration.notification0 = à¨à©±à¨ 
à¨®à¨¹à©±à¨¤à¨µà¨ªà©à¨°à¨¨ à¨«à¨¿à¨à¨¸ à¨¨à©à©° à¨²à¨¾à¨à© à¨à¨°à¨¨ 
à¨²à¨, à¨à¨¹ à¨à¨ªà¨¡à©à¨ à¨¤à©à¨¹à¨¾à¨¡à©à¨à¨ 
à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ à¨¦à© à¨¹à¨° à¨¥à¨¾à¨ à¨¨à¨¿à¨¯à¨® 
à¨ªà¨¸à©°à¨¦ à¨¨à©à©° à¨à¨¨à©à¨¹à¨¾à¨ à¨¦à© à¨¡à¨¿à¨«à¨¾à¨²à¨ 
à¨®à©à©±à¨²à¨¾à¨ à¨¤à© à¨¦à©à¨¬à¨¾à¨°à¨¾ à¨¸à©à¨ à¨à¨°à¨¦à¨¾ à¨¹à©.
+https-everywhere.menu.ruleset-tests =  à¨¹à¨° à¨à¨à©à¨¹à¨¾ 
à¨°à©à¨²à¨¸à©à©±à¨ à¨à©à¨¸à¨ à¨à©±à¨.à¨à©.à¨à©.à¨ªà©.à¨à©±à¨¸ 
à¨à¨²à¨¾à¨

___
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

2018-08-03 Thread translation

commit 4f1148b4793cd62ea000b491f73f2deb8934c711
Author: Translation commit bot 
Date:   Fri Aug 3 15:15:10 2018 +

Update translations for bridgedb_completed
---
 pt_BR/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index b703af0bc..9ddc39cb7 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-07-17 16:42+\n"
-"Last-Translator: Gustavo Vasconcelos \n"
+"PO-Revision-Date: 2018-08-02 19:06+\n"
+"Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\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] Document Onionoo versions 6.2 and 7.0.

2018-08-03 Thread karsten

commit 5618a8ff342f06a00ab2282b7e823993f099ad11
Author: Karsten Loesing 
Date:   Thu Aug 2 22:26:48 2018 +0200

Document Onionoo versions 6.2 and 7.0.
---
 src/main/resources/web/jsps/onionoo.jsp | 93 -
 1 file changed, 81 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/web/jsps/onionoo.jsp 
b/src/main/resources/web/jsps/onionoo.jsp
index 84bc87c..7c78c7c 100644
--- a/src/main/resources/web/jsps/onionoo.jsp
+++ b/src/main/resources/web/jsps/onionoo.jsp
@@ -316,6 +316,19 @@ documents in favor of the new "verified_host_names" and
 "unverified_host_names" fields for more accurate DNS results on July
 16, 2018.
 #
+6.2:
+Added an "as" field to details document, deprecated the "as_number" field, 
added
+an "as_name" parameter to search for relays by AS name, and added support for
+comma-separated lists in the "as" and the "lookup" parameters on August 3, 
2018.
+#
+7.0:
+(scheduled, but not deployed yet!): Extend the "version" parameter to support
+lists and ranges, remove redundant "1_week" and "1_month" graphs from clients
+documents, change "3_months" graphs to "6_months" graphs in all documents
+containing history objects, remove the "fingerprint" parameter, and remove the
+previously deprecated "as_number" field from details documents, to be deployed
+after September 3, 2018.
+#
 
 
 
@@ -472,7 +485,7 @@ Lookups are case-insensitive.
 
 
 
-fingerprint
+fingerprint deprecated
 #
 
 Return only the relay with the parameter value matching the fingerprint
@@ -484,6 +497,7 @@ with two exceptions:
 not be hashed (again) using SHA-1;
 (2) the response will contain any matching relay or bridge regardless of
 whether they have been running in the past week.
+Scheduled to be removed after September 3, 2018.
 
 
 
@@ -507,12 +521,32 @@ the GeoIP database.
 as updated
 #
 
-Return only relays which are located in the given autonomous system (AS) as
-identified by the AS number (with or without preceding "AS" part).  Filtering
-by AS number is case-insensitive. The special AS number 0 can be used
-for relays that were not found in the GeoIP database.
+Return only relays which are located in either one of the given autonomous
+systems (AS) as identified by AS number (with or without preceding "AS" part).
+Multiple AS numbers can be provided separated by commas.
+Filtering by AS number is case-insensitive.
+The special AS number 0 can be used for relays that were not found in
+the GeoIP database.
 Updated to recognize special AS number 0
-on July 16, 2018.
+on July 16, 2018 and to support comma-separated lists of AS numbers on August 
3,
+2018.
+
+
+
+
+
+as_name new
+#
+
+Return only relays with the parameter value matching (part of) the autonomous
+system (AS) name they are located in.
+If the parameter value contains spaces, only relays are returned which
+contain all space-separated parts in their AS name.
+Only printable ASCII characters are permitted in the parameter value,
+some of which need to be percent-encoded (# as %23, % as %25, & as
+%26, + as %2B, and / as %2F).
+Comparisons are case-insensitive.
+Added on August 3, 2018.
 
 
 
@@ -596,12 +630,22 @@ a family.
 
 
 
-version
+version updated
 #
 
 Return only relays or bridges running a Tor version that starts with the
 parameter value without leading "Tor".
 Searches are case-insensitive.
+Scheduled to support lists and ranges after September 3,
+2018:
+Return only relays or bridges running either Tor version from a list or range
+given in the parameter value.
+Tor versions must be provided without the leading "Tor"
+part.
+Multiple versions can either be provided as a comma-separated list (","), as a
+range separated by two dots (".."), or as a list of ranges.
+Provided versions are parsed and matched by parsed dotted numbers, rather than
+by string prefix.
 
 
 
@@ -1271,8 +1315,24 @@ database.
 
 
 
+
+as new
+string
+optional
+#
+
+AS number as found in an AS database by
+resolving the relay's first onion-routing IP address.
+AS number strings start with "AS", followed directly by the AS number.
+Omitted if the relay IP address could not be found in the AS
+database.
+Added on August 3, 2018.
+
+
+
+
 
-as_number
+as_number deprecated
 string
 optional
 #
@@ -1282,6 +1342,7 @@ resolving the relay's first onion-routing IP address.
 AS number strings start with "AS", followed directly by the AS number.
 Omitted if the relay IP address could not be found in the AS
 database.
+Scheduled to be removed after September 3, 2018.
 
 
 
@@ -2088,7 +2149,7 @@ hexadecimal characters.
 
 
 
-write_history
+write_history updated
 object
 optional
 #
@@ -2112,6 +2173,8 @@ The unit is bytes per second.
 Contained graph history objects may contain null values if the relay did
 not provide any bandwidth data or only data for less than 20% of a given
 time period.
+Scheduled to no longer contain a "3_months" graph and 
instead
+a "6_months" graph after September 3, 2018.
 
 
 
@@ -,7 +2285,7 @@ hexadecimal characte

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

2018-08-03 Thread translation

commit efd1143237f1586e08c83e067e463656d205f9cc
Author: Translation commit bot 
Date:   Thu Aug 2 17:45:05 2018 +

Update translations for bridgedb
---
 ml/LC_MESSAGES/bridgedb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index a8feb804a..09a344224 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# NITHIN S SABU , 2018
 # Salman Faris , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-02-20 18:46+\n"
-"Last-Translator: ST Alfas\n"
+"PO-Revision-Date: 2018-08-02 17:31+\n"
+"Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "à´àµà´·à´®à´¿à´àµà´à´£à´! à´à´¨àµà´¤àµà´¾ 
à´¨à´¿à´àµà´à´³àµà´àµ à´à´àµà´¯àµ¼à´¤àµà´¥à´¨ 
à´¤àµà´±àµà´±à´¾à´¯à´¿ à´ªàµà´¾à´¯à´¿."
+msgstr "à´àµà´·à´®à´¿à´àµà´àµ! à´à´¿à´àµà´à´³àµà´àµ à´
à´àµà´¯àµ¼à´¤àµà´¥à´¨à´¯à´¿àµ½ à´¤àµà´±àµà´±àµà´£àµà´àµ "
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
@@ -44,11 +45,11 @@ msgstr "à´¸àµà´¾à´´àµà´¸àµ à´àµà´¾à´¡àµ"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "à´àµà´¯àµà´àµà´àµà´²àµà´¾à´àµ"
+msgstr "à´®à´¾à´±àµà´± à´µà´¿à´µà´°à´ªàµà´ªà´àµà´à´¿à´ "
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr "à´àµà´¾àµºà´à´¾à´àµà´±àµà´±àµ"
+msgstr "à´à´àµà´à´³àµ à´¸à´®àµà´ªà´¿à´àµà´àµ "
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"



___
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

2018-08-03 Thread translation

commit 5d37a860eb33120b59e909a7e9070d0e5774dc4c
Author: Translation commit bot 
Date:   Thu Aug 2 18:15:05 2018 +

Update translations for bridgedb
---
 ml/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index 09a344224..07410f407 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-08-02 17:31+\n"
+"PO-Revision-Date: 2018-08-02 18:03+\n"
 "Last-Translator: NITHIN S SABU \n"
 "Language-Team: Malayalam 
(http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr "à´®à´¾à´±àµà´± à´µà´¿à´µà´°à´ªàµà´ªà´àµà´à´¿à´ "
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr "à´à´àµà´à´³àµ à´¸à´®àµà´ªà´¿à´àµà´àµ "
+msgstr "à´¬à´¨àµà´§à´ªàµà´ªàµà´àµ "
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"



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

[tor-commits] [translation/bridgedb] Merge branch 'bridgedb' of ssh://git-rw.torproject.org/translation into bridgedb

2018-08-03 Thread translation

commit ac0f4a66fa38a7327a3d8397a09308f445489446
Merge: 19eb0d191 981357455
Author: Translation commit bot 
Date:   Fri Aug 3 14:55:30 2018 +

Merge branch 'bridgedb' of ssh://git-rw.torproject.org/translation into 
bridgedb

 af/LC_MESSAGES/bridgedb.po   |   4 +-
 af_ZA/LC_MESSAGES/bridgedb.po| 101 --
 am_ET/LC_MESSAGES/bridgedb.po| 381 ---
 bn/LC_MESSAGES/bridgedb.po   |  28 ++-
 bn_BD/LC_MESSAGES/bridgedb.po| 381 ---
 cs_CZ/LC_MESSAGES/bridgedb.po| 380 --
 es_NI/LC_MESSAGES/bridgedb.po| 100 -
 si/LC_MESSAGES/bridgedb.po   | 379 --
 sq_AL/LC_MESSAGES/bridgedb.po| 380 --
 zh/LC_MESSAGES/bridgedb.po   | 100 -
 zh_CN.GB2312/LC_MESSAGES/bridgedb.po | 100 -
 11 files changed, 28 insertions(+), 2306 deletions(-)

___
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

2018-08-03 Thread translation

commit 19eb0d19190800c92f1b9ba5d7579fe5f736f3f5
Author: Translation commit bot 
Date:   Thu Aug 2 19:15:05 2018 +

Update translations for bridgedb
---
 pt_BR/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index b703af0bc..9ddc39cb7 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-07-17 16:42+\n"
-"Last-Translator: Gustavo Vasconcelos \n"
+"PO-Revision-Date: 2018-08-02 19:06+\n"
+"Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"



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

[tor-commits] [onionoo/master] Bump version to 6.2-1.16.0-dev.

2018-08-03 Thread karsten

commit b77ee97bfbf837fc3353e9414ad291e54e03d5bc
Author: Karsten Loesing 
Date:   Fri Aug 3 16:36:24 2018 +0200

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

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

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

2018-08-03 Thread karsten

commit 31af3b4929f84ab71593498213a9dad81b2190cf
Author: Karsten Loesing 
Date:   Thu Aug 2 21:24:28 2018 +0200

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

diff --git a/src/build b/src/build
index 23c6e0b..08514a3 16
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 23c6e0be5fab9463f137615053ef412e4da2315e
+Subproject commit 08514a32afefbeef848b80f9a338ee840c282604



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

[tor-commits] [onionoo/release] Add change log entry for thin jar file.

2018-08-03 Thread karsten

commit c1fa0c31f67a4701f6ae71282bf9df5d6b0e2965
Author: Karsten Loesing 
Date:   Thu Aug 2 21:28:42 2018 +0200

Add change log entry for thin jar file.

Resolves #26969.
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f3a958..c5f752d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
  * Minor changes
- Extend internal statistics to log less frequently requested
  resources and parameter combinations without counts.
+   - Provide a thin jar file without dependencies.
 
 
 # Changes in version 6.1-1.15.0 - 2018-07-16



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

[tor-commits] [onionoo/release] Bump version to 6.1-1.15.0-dev.

2018-08-03 Thread karsten

commit 335a9ea2ec1449a1f9caa2c07ddab8cbe1a5a53a
Author: Karsten Loesing 
Date:   Mon Jul 16 16:15:59 2018 +0200

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

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

[tor-commits] [onionoo/release] Prepare for 6.2-1.16.0 release.

2018-08-03 Thread karsten

commit 49879eb7cc19b1e24048776e5404041e371f29f4
Author: Karsten Loesing 
Date:   Fri Aug 3 12:08:26 2018 +0200

Prepare for 6.2-1.16.0 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 4 ++--
 src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5f752d..99422f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 6.2-1.16.0 - 2018-07-??
+# Changes in version 6.2-1.16.0 - 2018-08-03
 
  * Medium changes
- Support a comma-separated list of fingerprints in the lookup
diff --git a/build.xml b/build.xml
index 1bc5734..5af2474 100644
--- a/build.xml
+++ b/build.xml
@@ -8,9 +8,9 @@
 
   
   
-  
+  
   
+value="${onionoo.protocol.version}-1.16.0"/>
   
   
relays, PrintWriter pw) {
 this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

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

[tor-commits] [onionoo/release] Support comma-separated list in "as" parameter.

2018-08-03 Thread karsten

commit a6e08a33b95393dc29ace64bea8c50d808160e24
Author: Karsten Loesing 
Date:   Tue Jul 24 21:54:19 2018 +0200

Support comma-separated list in "as" parameter.

Implements the last part of #23713.
---
 CHANGELOG.md   |  2 ++
 .../torproject/onionoo/server/RequestHandler.java  | 32 +-
 .../torproject/onionoo/server/ResourceServlet.java | 14 +++---
 .../onionoo/server/ResourceServletTest.java|  6 
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89b36eb..d024d83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
- Add "as" field as a copy of the "as_number" field in preparation
  of removing the "as_number" field in the future.
- Add new "as_name" parameter to search relays by AS name.
+   - Support a comma-separated list of AS numbers in the "as"
+ parameter.
 
 
 # Changes in version 6.1-1.15.0 - 2018-07-16
diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java 
b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
index e401ae9..33c35e1 100644
--- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java
+++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
@@ -72,9 +72,9 @@ public class RequestHandler {
 this.country = country;
   }
 
-  private String as;
+  private String[] as;
 
-  public void setAs(String as) {
+  public void setAs(String[] as) {
 this.as = as;
   }
 
@@ -408,29 +408,23 @@ public class RequestHandler {
   }
 
   private void filterByAsNumber() {
-if (this.as == null) {
+if (this.as == null || 0 == this.as.length) {
   /* Not filtering by AS number. */
   return;
 }
-String asNumber = this.as.toUpperCase();
-if (!asNumber.startsWith("AS")) {
-  asNumber = "AS" + asNumber;
-}
-if (!this.nodeIndex.getRelaysByAsNumber().containsKey(asNumber)) {
-  this.filteredRelays.clear();
-} else {
-  Set relaysWithAsNumber =
-  this.nodeIndex.getRelaysByAsNumber().get(asNumber);
-  Set removeRelays = new HashSet<>();
-  for (String fingerprint : this.filteredRelays.keySet()) {
-if (!relaysWithAsNumber.contains(fingerprint)) {
-  removeRelays.add(fingerprint);
+Map matchingRelays = new HashMap<>();
+for (String asNumber : this.as) {
+  if (this.nodeIndex.getRelaysByAsNumber().containsKey(asNumber)) {
+for (String fingerprint
+: this.nodeIndex.getRelaysByAsNumber().get(asNumber)) {
+  if (this.filteredRelays.containsKey(fingerprint)) {
+matchingRelays.put(fingerprint,
+this.filteredRelays.get(fingerprint));
+  }
 }
   }
-  for (String fingerprint : removeRelays) {
-this.filteredRelays.remove(fingerprint);
-  }
 }
+this.filteredRelays = matchingRelays;
 this.filteredBridges.clear();
   }
 
diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java 
b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
index cf480d3..57c8f83 100644
--- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
+++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
@@ -238,7 +238,7 @@ public class ResourceServlet extends HttpServlet {
   rh.setCountry(countryCodeParameter);
 }
 if (parameterMap.containsKey("as")) {
-  String asNumberParameter = this.parseAsNumberParameter(
+  String[] asNumberParameter = this.parseAsNumberParameter(
   parameterMap.get("as"));
   if (asNumberParameter == null) {
 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
@@ -502,14 +502,20 @@ public class ResourceServlet extends HttpServlet {
   }
 
   private static Pattern asNumberParameterPattern =
-  Pattern.compile("^[asAS]{0,2}[0-9]{1,10}$");
+  Pattern.compile("((^|,)([aA][sS])?[1-9][0-9]{0,9})+$");
 
-  private String parseAsNumberParameter(String parameter) {
+  private String[] parseAsNumberParameter(String parameter) {
 if (!asNumberParameterPattern.matcher(parameter).matches()) {
   /* AS number contains illegal character(s). */
   return null;
 }
-return parameter;
+String[] parameterParts = parameter.toUpperCase().split(",");
+String[] parsedParameter = new String[parameterParts.length];
+for (int i = 0; i < parameterParts.length; i++) {
+  parsedParameter[i] = (!parameterParts[i].startsWith("AS") ? "AS" : "")
+  + parameterParts[i];
+}
+return parsedParameter;
   }
 
   private String[] parseAsNameParameter(String parameter) {
diff --git 
a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java 
b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java
index 37f7923..e176d9b 100644
--- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java
+++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.ja

[tor-commits] [onionoo/release] Add "as" field as a copy of "as_number".

2018-08-03 Thread karsten

commit dcd204de903fc844586796c27d25492ba890d27b
Author: Karsten Loesing 
Date:   Tue Jul 24 10:43:31 2018 +0200

Add "as" field as a copy of "as_number".

Implements part of #23713.
---
 CHANGELOG.md  |  2 ++
 .../org/torproject/onionoo/docs/DetailsDocument.java  | 19 +++
 .../torproject/onionoo/server/ResponseBuilder.java|  2 ++
 .../onionoo/writer/DetailsDocumentWriter.java |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a0c6a..9d0d091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
- Support a comma-separated list of fingerprints in the lookup
  parameter to allow for URLs that specify a list of relays or
  bridges.
+   - Add "as" field as a copy of the "as_number" field in preparation
+ of removing the "as_number" field in the future.
 
 
 # Changes in version 6.1-1.15.0 - 2018-07-16
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index 7820305..650ba5b 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -201,12 +201,31 @@ public class DetailsDocument extends Document {
 return this.longitude;
   }
 
+  private String as;
+
+  @Deprecated
   private String asNumber;
 
+  public void setAs(String as) {
+this.as = escapeJson(as);
+  }
+
+  @Deprecated
   public void setAsNumber(String asNumber) {
 this.asNumber = escapeJson(asNumber);
   }
 
+  @Deprecated
+  public void setAsAndAsNumber(String asNumber) {
+this.as = escapeJson(asNumber);
+this.asNumber = escapeJson(asNumber);
+  }
+
+  public String getAs() {
+return unescapeJson(this.as);
+  }
+
+  @Deprecated
   public String getAsNumber() {
 return unescapeJson(this.asNumber);
   }
diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java 
b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
index 241b3bd..1a5c925 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -279,6 +279,8 @@ public class ResponseBuilder {
 dd.setLatitude(detailsDocument.getLatitude());
   } else if (field.equals("longitude")) {
 dd.setLongitude(detailsDocument.getLongitude());
+  } else if (field.equals("as")) {
+dd.setAs(detailsDocument.getAs());
   } else if (field.equals("as_number")) {
 dd.setAsNumber(detailsDocument.getAsNumber());
   } else if (field.equals("as_name")) {
diff --git 
a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java 
b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
index bc5bf8c..0162d0b 100644
--- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
+++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java
@@ -97,7 +97,7 @@ public class DetailsDocumentWriter implements DocumentWriter {
 detailsDocument.setCountryName(detailsStatus.getCountryName());
 detailsDocument.setRegionName(detailsStatus.getRegionName());
 detailsDocument.setCityName(detailsStatus.getCityName());
-detailsDocument.setAsNumber(detailsStatus.getAsNumber());
+detailsDocument.setAsAndAsNumber(detailsStatus.getAsNumber());
 detailsDocument.setAsName(detailsStatus.getAsName());
 if (detailsStatus.isRunning()) {
   detailsDocument.setConsensusWeightFraction(



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

[tor-commits] [onionoo/release] Add new "as_name" parameter.

2018-08-03 Thread karsten

commit a7d03e231499e37d82a47230886693a5d3127d20
Author: Karsten Loesing 
Date:   Tue Jul 24 14:46:50 2018 +0200

Add new "as_name" parameter.

Implements another part of #23713.
---
 CHANGELOG.md   |  1 +
 .../org/torproject/onionoo/docs/DocumentStore.java |  3 +-
 .../org/torproject/onionoo/docs/NodeStatus.java| 14 +
 .../torproject/onionoo/docs/SummaryDocument.java   | 14 -
 .../org/torproject/onionoo/server/NodeIndex.java   | 10 +++
 .../org/torproject/onionoo/server/NodeIndexer.java |  8 +
 .../torproject/onionoo/server/RequestHandler.java  | 29 ++
 .../torproject/onionoo/server/ResourceServlet.java | 25 ++--
 .../onionoo/updater/NodeDetailsStatusUpdater.java  |  4 +++
 .../onionoo/writer/SummaryDocumentWriter.java  |  3 +-
 .../onionoo/docs/SummaryDocumentTest.java  |  1 +
 .../onionoo/server/ResourceServletTest.java| 35 +++---
 .../server/SummaryDocumentComparatorTest.java  |  1 +
 13 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0d091..89b36eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
  bridges.
- Add "as" field as a copy of the "as_number" field in preparation
  of removing the "as_number" field in the future.
+   - Add new "as_name" parameter to search relays by AS name.
 
 
 # Changes in version 6.1-1.15.0 - 2018-07-16
diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java 
b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
index b044788..8cf76c8 100644
--- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
@@ -415,6 +415,7 @@ public class DocumentStore {
 List addresses = new ArrayList<>();
 String countryCode = null;
 String asNumber = null;
+String asName = null;
 String contact = null;
 for (String orAddressAndPort : detailsDocument.getOrAddresses()) {
   if (!orAddressAndPort.contains(":")) {
@@ -451,7 +452,7 @@ public class DocumentStore {
 SummaryDocument summaryDocument = new SummaryDocument(isRelay,
 nickname, fingerprint, addresses, lastSeenMillis, running,
 relayFlags, consensusWeight, countryCode, firstSeenMillis,
-asNumber, contact, family, family, version, operatingSystem,
+asNumber, asName, contact, family, family, version, operatingSystem,
 hostName, verifiedHostNames, unverifiedHostNames,
 recommendedVersion);
 return summaryDocument;
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 46da822..63720d9 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -387,6 +387,16 @@ public class NodeStatus extends Document {
 return this.asNumber;
   }
 
+  private String asName;
+
+  public void setAsName(String asName) {
+this.asName = asName;
+  }
+
+  public String getAsName() {
+return this.asName;
+  }
+
   /* Reverse DNS lookup result */
 
   private String hostName;
@@ -618,6 +628,9 @@ public class NodeStatus extends Document {
   if (parts.length >= 26) {
 
nodeStatus.setVersionStatus(TorVersionStatus.ofAbbreviation(parts[25]));
   }
+  if (parts.length >= 27) {
+nodeStatus.setAsName(parts[26]);
+  }
   return nodeStatus;
 } catch (NumberFormatException e) {
   log.error("Number format exception while parsing node "
@@ -688,6 +701,7 @@ public class NodeStatus extends Document {
 .append((this.getHostName() != null ? this.getHostName() : ""));
 sb.append("\t").append(null != this.getVersionStatus()
 ? this.getVersionStatus().getAbbreviation() : "");
+sb.append("\t").append((this.asName != null ? this.asName : ""));
 return sb.toString();
   }
 }
diff --git a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java 
b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
index 92ebe69..fc84ba6 100644
--- a/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/SummaryDocument.java
@@ -190,6 +190,17 @@ public class SummaryDocument extends Document {
 return this.asNumber;
   }
 
+  @JsonProperty("an")
+  private String asName;
+
+  public void setAsName(String asName) {
+this.asName = asName;
+  }
+
+  public String getAsName() {
+return this.asName;
+  }
+
   @JsonProperty("fs")
   private String firstSeenMillis;
 
@@ -364,7 +375,7 @@ public class SummaryDocument extends Document {
   public SummaryDocument(boolean isRelay, String nickname,
   String fingerprint, List addresses, long lastSeenMillis,
   boolean running, SortedSet relayFlags, long consensusWeight,
-  String countryCode, long firstSeenMillis, String asNumber,
+

[tor-commits] [onionoo/release] Allow for URLs that specify list of fingerprints.

2018-08-03 Thread karsten

commit c9218fbd3b8f029857cca1cde4c16dc5099f129d
Author: Karsten Loesing 
Date:   Tue Jul 24 09:11:18 2018 +0200

Allow for URLs that specify list of fingerprints.

Implements #25448.
---
 CHANGELOG.md   |  8 ++
 .../torproject/onionoo/server/RequestHandler.java  | 25 +
 .../torproject/onionoo/server/ResourceServlet.java | 31 +-
 .../onionoo/server/ResourceServletTest.java| 14 ++
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd11502..00a0c6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Changes in version 6.2-1.16.0 - 2018-07-??
+
+ * Medium changes
+   - Support a comma-separated list of fingerprints in the lookup
+ parameter to allow for URLs that specify a list of relays or
+ bridges.
+
+
 # Changes in version 6.1-1.15.0 - 2018-07-16
 
  * Medium changes
diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java 
b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
index b9d9b23..344178b 100644
--- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java
+++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
@@ -54,9 +54,9 @@ public class RequestHandler {
 System.arraycopy(search, 0, this.search, 0, search.length);
   }
 
-  private String lookup;
+  private String[] lookup;
 
-  public void setLookup(String lookup) {
+  public void setLookup(String[] lookup) {
 this.lookup = lookup;
   }
 
@@ -340,17 +340,20 @@ public class RequestHandler {
   /* Not filtering by looking up relay or bridge. */
   return;
 }
-String fingerprint = this.lookup;
-SummaryDocument relayLine = this.filteredRelays.get(fingerprint);
-this.filteredRelays.clear();
-if (relayLine != null) {
-  this.filteredRelays.put(fingerprint, relayLine);
+Map matchingRelays = new HashMap<>();
+for (String fingerprint : this.lookup) {
+  if (this.filteredRelays.containsKey(fingerprint)) {
+matchingRelays.put(fingerprint, this.filteredRelays.get(fingerprint));
+  }
 }
-SummaryDocument bridgeLine = this.filteredBridges.get(fingerprint);
-this.filteredBridges.clear();
-if (bridgeLine != null) {
-  this.filteredBridges.put(fingerprint, bridgeLine);
+this.filteredRelays = matchingRelays;
+Map matchingBridges = new HashMap<>();
+for (String fingerprint : this.lookup) {
+  if (this.filteredBridges.containsKey(fingerprint)) {
+matchingBridges.put(fingerprint, 
this.filteredBridges.get(fingerprint));
+  }
 }
+this.filteredBridges = matchingBridges;
   }
 
   private void filterByFingerprint() {
diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java 
b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
index e119518..534dc0c 100644
--- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
+++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
@@ -211,24 +211,22 @@ public class ResourceServlet extends HttpServlet {
   rh.setRunning(runningRequested ? "true" : "false");
 }
 if (parameterMap.containsKey("lookup")) {
-  String lookupParameter = this.parseFingerprintParameter(
+  String[] lookupParameter = this.parseFingerprintParameter(
   parameterMap.get("lookup"));
   if (lookupParameter == null) {
 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return;
   }
-  String fingerprint = lookupParameter.toUpperCase();
-  rh.setLookup(fingerprint);
+  rh.setLookup(lookupParameter);
 }
 if (parameterMap.containsKey("fingerprint")) {
-  String fingerprintParameter = this.parseFingerprintParameter(
+  String[] fingerprintParameter = this.parseFingerprintParameter(
   parameterMap.get("fingerprint"));
-  if (fingerprintParameter == null) {
+  if (null == fingerprintParameter || 1 != fingerprintParameter.length) {
 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return;
   }
-  String fingerprint = fingerprintParameter.toUpperCase();
-  rh.setFingerprint(fingerprint);
+  rh.setFingerprint(fingerprintParameter[0]);
 }
 if (parameterMap.containsKey("country")) {
   String countryCodeParameter = this.parseCountryCodeParameter(
@@ -360,14 +358,13 @@ public class ResourceServlet extends HttpServlet {
   rh.setLimit(limitParameter);
 }
 if (parameterMap.containsKey("family")) {
-  String familyParameter = this.parseFingerprintParameter(
+  String[] familyParameter = this.parseFingerprintParameter(
   parameterMap.get("family"));
-  if (familyParameter == null) {
-response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+  if (null == familyParameter || 1 != familyParameter.length) {
+  response.sendError(HttpServletResponse.SC_BAD_REQUEST);

[tor-commits] [onionoo/release] Add change log entry for #26963.

2018-08-03 Thread karsten

commit ed6d7dfd5a02c1af624eb69235c8e02a4a74e68f
Author: Karsten Loesing 
Date:   Thu Aug 2 21:16:21 2018 +0200

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3428c1..9f3a958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
- Add new "as_name" parameter to search relays by AS name.
- Support a comma-separated list of AS numbers in the "as"
  parameter.
+   - Fix a thread-safety bug in the recently extended reverse DNS
+ lookup code.
 
  * Minor changes
- Extend internal statistics to log less frequently requested



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

[tor-commits] [onionoo/release] Stop sharing the JNDI DirContext

2018-08-03 Thread karsten

commit 2b6916bdc0249d129b5aa08ab84e20e892ad7ad5
Author: Iain R. Learmonth 
Date:   Tue Jul 31 14:50:42 2018 +0100

Stop sharing the JNDI DirContext

In the implementation of more accurate DNS resolution, the DirContext
used by JNDI lookups was shared in a utility class. It turns out that
InitialDirContext, the implementation we used, is very not thread-safe
and so as a result lookups would often fail to complete.

This commit creates a new DirContext for every lookup. The overhead in
doing so is minimal and ensures that we do not have thread safety
issues.

This commit also increases RDNS_LOOKUP_WORKERS_NUM to 30 (from 5). The
majority of time in these threads is spent waiting for replies and so
there are gains to be had in increasing the number of requests in
flight.

Fixes: #26963
---
 .../onionoo/updater/RdnsLookupRequest.java | 48 
 .../onionoo/updater/RdnsLookupWorker.java  |  2 +-
 .../onionoo/updater/ReverseDomainNameResolver.java | 10 +---
 .../torproject/onionoo/util/DomainNameSystem.java  | 66 --
 4 files changed, 38 insertions(+), 88 deletions(-)

diff --git 
a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java 
b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java
index 7f14350..3859262 100644
--- a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java
+++ b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java
@@ -3,19 +3,22 @@
 
 package org.torproject.onionoo.updater;
 
-import org.torproject.onionoo.util.DomainNameSystem;
-
 import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
 
 class RdnsLookupRequest extends Thread {
 
-  private ReverseDomainNameResolver reverseDomainNameResolver;
-
-  private DomainNameSystem domainNameSystem;
-
   private RdnsLookupWorker parent;
 
   private String address;
@@ -29,11 +32,7 @@ class RdnsLookupRequest extends Thread {
   private long lookupCompletedMillis = -1L;
 
   public RdnsLookupRequest(
-  ReverseDomainNameResolver reverseDomainNameResolver,
   RdnsLookupWorker parent, String address) {
-this.reverseDomainNameResolver = reverseDomainNameResolver;
-this.domainNameSystem =
-this.reverseDomainNameResolver.getDomainNameSystemInstance();
 this.parent = parent;
 this.address = address;
   }
@@ -51,11 +50,11 @@ class RdnsLookupRequest extends Thread {
 + "." + bytes[2] + "." + bytes[1] + "." + bytes[0]
 + ".in-addr.arpa";
 String[] reverseDnsRecords =
-this.domainNameSystem.getRecords(reverseDnsDomain, "PTR");
+this.getRecords(reverseDnsDomain, "PTR");
 for (String reverseDnsRecord : reverseDnsRecords) {
   boolean verified = false;
   String[] forwardDnsRecords =
-  this.domainNameSystem.getRecords(reverseDnsRecord, "A");
+  this.getRecords(reverseDnsRecord, "A");
   for (String forwardDnsRecord : forwardDnsRecords) {
 if (forwardDnsRecord.equals(this.address)) {
   verified = true;
@@ -83,6 +82,31 @@ class RdnsLookupRequest extends Thread {
 this.parent.interrupt();
   }
 
+  /**
+   * Returns all the values of DNS resource records found for a given host name
+   * and type.
+   */
+  public String[] getRecords(String hostName, String type)
+  throws NamingException {
+Hashtable envProps = new Hashtable<>();
+envProps.put(Context.INITIAL_CONTEXT_FACTORY,
+"com.sun.jndi.dns.DnsContextFactory");
+final DirContext dnsContext = new InitialDirContext(envProps);
+Set results = new TreeSet();
+Attributes dnsEntries =
+dnsContext.getAttributes(hostName, new String[] { type });
+if (dnsEntries != null) {
+  Attribute dnsAttribute = dnsEntries.get(type);
+  if (dnsAttribute != null) {
+NamingEnumeration dnsEntryIterator = dnsEntries.get(type).getAll();
+while (dnsEntryIterator.hasMoreElements()) {
+  results.add(dnsEntryIterator.next().toString());
+}
+  }
+}
+return results.toArray(new String[results.size()]);
+  }
+
   public synchronized String getHostName() {
 List verifiedHostNames = this.verifiedHostNames;
 if (null != verifiedHostNames && !verifiedHostNames.isEmpty() ) {
diff --git a/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java 
b/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.java
index c94c334..953fdd2 100644
--- a/src/main/java/org/torproject/onionoo/updater/RdnsLookupWorker.j

[tor-commits] [onionoo/release] Fix and extend test for #26919 logging patch.

2018-08-03 Thread karsten

commit 7172978cde0c8de518c17537352c7e202d0fdb6d
Author: Karsten Loesing 
Date:   Thu Aug 2 21:21:45 2018 +0200

Fix and extend test for #26919 logging patch.
---
 .../torproject/onionoo/server/PerformanceMetricsTest.java  | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java 
b/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java
index 80328e5..e3d60ef 100644
--- a/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java
+++ b/src/test/java/org/torproject/onionoo/server/PerformanceMetricsTest.java
@@ -85,13 +85,23 @@ public class PerformanceMetricsTest {
   }
 
   @Test
-  public void testMostFrequentStringAbcd() {
+  public void testMostFrequentStringAcceee() {
 MostFrequentString mfs = new MostFrequentString();
 mfs.addString("A");
 mfs.addString("B");
+mfs.addString("B");
+mfs.addString("B");
+mfs.addString("B");
+mfs.addString("C");
 mfs.addString("C");
 mfs.addString("D");
-assertEquals("A (1), B (1), C (1)", mfs.toString());
+mfs.addString("D");
+mfs.addString("D");
+mfs.addString("D");
+mfs.addString("E");
+mfs.addString("E");
+mfs.addString("E");
+assertEquals("B (4), D (4), E (3), A, C", mfs.toString());
   }
 
   @Test



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

[tor-commits] [onionoo/release] Fix trivial whitespace issue.

2018-08-03 Thread karsten

commit f7f08b804f21f2ea703d868880ec7fc929780c8a
Author: Karsten Loesing 
Date:   Sun Jul 29 22:12:58 2018 +0200

Fix trivial whitespace issue.
---
 src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java 
b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
index 57c8f83..15087de 100644
--- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
+++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
@@ -370,7 +370,7 @@ public class ResourceServlet extends HttpServlet {
   String[] familyParameter = this.parseFingerprintParameter(
   parameterMap.get("family"));
   if (null == familyParameter || 1 != familyParameter.length) {
-  response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 return;
   }
   rh.setFamily(familyParameter[0]);



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

[tor-commits] [onionoo/release] Change document member names to camelCase.

2018-08-03 Thread karsten

commit 747995f947a5a1b71f0136cfcaf7e2523526fb95
Author: Karsten Loesing 
Date:   Tue Jul 10 10:51:13 2018 +0200

Change document member names to camelCase.

Jackson can convert names to snake_case by itself just fine.

Prepares #24296.
---
 .../torproject/onionoo/docs/BandwidthDocument.java |  13 +-
 .../torproject/onionoo/docs/ClientsDocument.java   |   5 +-
 .../torproject/onionoo/docs/DetailsDocument.java   | 221 +
 .../org/torproject/onionoo/docs/DetailsStatus.java | 261 ++---
 .../torproject/onionoo/docs/UptimeDocument.java|   1 -
 .../torproject/onionoo/docs/WeightsDocument.java   |  21 +-
 6 files changed, 258 insertions(+), 264 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java 
b/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java
index bccbb87..03194a7 100644
--- a/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/BandwidthDocument.java
@@ -5,7 +5,6 @@ package org.torproject.onionoo.docs;
 
 import java.util.Map;
 
-@SuppressWarnings("checkstyle:membername")
 public class BandwidthDocument extends Document {
 
   @SuppressWarnings("unused")
@@ -15,24 +14,24 @@ public class BandwidthDocument extends Document {
 this.fingerprint = fingerprint;
   }
 
-  private Map write_history;
+  private Map writeHistory;
 
   public void setWriteHistory(Map writeHistory) {
-this.write_history = writeHistory;
+this.writeHistory = writeHistory;
   }
 
   public Map getWriteHistory() {
-return this.write_history;
+return this.writeHistory;
   }
 
-  private Map read_history;
+  private Map readHistory;
 
   public void setReadHistory(Map readHistory) {
-this.read_history = readHistory;
+this.readHistory = readHistory;
   }
 
   public Map getReadHistory() {
-return this.read_history;
+return this.readHistory;
   }
 }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java 
b/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java
index 16e7bc5..6660b68 100644
--- a/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java
@@ -5,7 +5,6 @@ package org.torproject.onionoo.docs;
 
 import java.util.Map;
 
-@SuppressWarnings("checkstyle:membername")
 public class ClientsDocument extends Document {
 
   @SuppressWarnings("unused")
@@ -16,11 +15,11 @@ public class ClientsDocument extends Document {
   }
 
   @SuppressWarnings("unused")
-  private Map average_clients;
+  private Map averageClients;
 
   public void setAverageClients(
   Map averageClients) {
-this.average_clients = averageClients;
+this.averageClients = averageClients;
   }
 }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index 7dcf38e..7820305 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -10,7 +10,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
 
-@SuppressWarnings("checkstyle:membername")
 public class DetailsDocument extends Document {
 
   /* We must ensure that details files only contain ASCII characters
@@ -49,77 +48,77 @@ public class DetailsDocument extends Document {
 return this.fingerprint;
   }
 
-  private String hashed_fingerprint;
+  private String hashedFingerprint;
 
   public void setHashedFingerprint(String hashedFingerprint) {
-this.hashed_fingerprint = hashedFingerprint;
+this.hashedFingerprint = hashedFingerprint;
   }
 
   public String getHashedFingerprint() {
-return this.hashed_fingerprint;
+return this.hashedFingerprint;
   }
 
-  private List or_addresses;
+  private List orAddresses;
 
   public void setOrAddresses(List orAddresses) {
-this.or_addresses = orAddresses;
+this.orAddresses = orAddresses;
   }
 
   public List getOrAddresses() {
-return this.or_addresses;
+return this.orAddresses;
   }
 
-  private List exit_addresses;
+  private List exitAddresses;
 
   public void setExitAddresses(List exitAddresses) {
-this.exit_addresses = !exitAddresses.isEmpty() ? exitAddresses : null;
+this.exitAddresses = !exitAddresses.isEmpty() ? exitAddresses : null;
   }
 
   public List getExitAddresses() {
-return this.exit_addresses == null ? new ArrayList()
-: this.exit_addresses;
+return this.exitAddresses == null ? new ArrayList()
+: this.exitAddresses;
   }
 
-  private String dir_address;
+  private String dirAddress;
 
   public void setDirAddress(String dirAddress) {
-this.dir_address = dirAddress;
+this.dirAddress = dirAddress;
   }
 
   public String getDirAddress() {
-return this.dir_address;
+return this.dirAddress;
   }
 
-  private String last_seen;
+  private String lastSeen;
 
   public void

[tor-commits] [onionoo/release] Log less frequently requested parameter combinations.

2018-08-03 Thread karsten

commit 8ea8ab0fa06c566c66811a9970f5633cfd90d186
Author: Karsten Loesing 
Date:   Sun Jul 29 21:42:57 2018 +0200

Log less frequently requested parameter combinations.

Implements the first part of #26919, which is to find out whether the
"fingerprint" parameter is used at all.
---
 CHANGELOG.md | 4 
 .../java/org/torproject/onionoo/server/MostFrequentString.java   | 9 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d024d83..f3428c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@
- Support a comma-separated list of AS numbers in the "as"
  parameter.
 
+ * Minor changes
+   - Extend internal statistics to log less frequently requested
+ resources and parameter combinations without counts.
+
 
 # Changes in version 6.1-1.15.0 - 2018-07-16
 
diff --git 
a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java 
b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
index 9fa51c7..c677bb5 100644
--- a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
+++ b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
@@ -43,17 +43,20 @@ class MostFrequentString {
 StringBuilder sb = new StringBuilder();
 int stringsToAdd = 3;
 int written = 0;
+SortedSet remainingStrings = new TreeSet<>();
 for (Map.Entry> e :
 sortedFrequencies.entrySet()) {
   for (String string : e.getValue()) {
 if (stringsToAdd-- > 0) {
   sb.append((written++ > 0 ? ", " : "") + string + " ("
   + e.getKey() + ")");
+} else {
+  remainingStrings.add(string);
 }
   }
-  if (stringsToAdd == 0) {
-break;
-  }
+}
+for (String string : remainingStrings) {
+  sb.append(", ").append(string);
 }
 return sb.toString();
   }



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

[tor-commits] [onionoo/release] Configure Jackson using class annotations.

2018-08-03 Thread karsten

commit 52494a7f343baa1d0ae84078ad23dac52e616c1d
Author: Karsten Loesing 
Date:   Wed Jul 11 21:49:40 2018 +0200

Configure Jackson using class annotations.
---
 src/main/java/org/torproject/onionoo/docs/Document.java   | 15 +++
 .../java/org/torproject/onionoo/docs/DocumentStore.java   | 10 +-
 .../org/torproject/onionoo/server/ResponseBuilder.java| 10 +-
 .../torproject/onionoo/server/ResourceServletTest.java| 12 
 .../onionoo/writer/GraphHistoryCompilerTest.java  | 10 +-
 5 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/Document.java 
b/src/main/java/org/torproject/onionoo/docs/Document.java
index 54bb0d5..9d8d484 100644
--- a/src/main/java/org/torproject/onionoo/docs/Document.java
+++ b/src/main/java/org/torproject/onionoo/docs/Document.java
@@ -3,6 +3,21 @@
 
 package org.torproject.onionoo.docs;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+/* Use snake_case for naming fields rather than camelCase. */
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+/* Exclude fields that are null or empty. */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+/* Only consider fields, no getters, setters, or constructors. */
+@JsonAutoDetect(creatorVisibility = JsonAutoDetect.Visibility.NONE,
+fieldVisibility = JsonAutoDetect.Visibility.ANY,
+getterVisibility = JsonAutoDetect.Visibility.NONE,
+isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+setterVisibility = JsonAutoDetect.Visibility.NONE)
 public abstract class Document {
 
   private transient String documentString;
diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java 
b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
index e474684..b044788 100644
--- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
+++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java
@@ -5,12 +5,8 @@ package org.torproject.onionoo.docs;
 
 import org.torproject.onionoo.util.FormattingUtils;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,11 +40,7 @@ public class DocumentStore {
   private static Logger log = LoggerFactory.getLogger(
   DocumentStore.class);
 
-  private static ObjectMapper objectMapper = new ObjectMapper()
-  .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-  .setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-  .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
-  .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+  private static ObjectMapper objectMapper = new ObjectMapper();
 
   private final File statusDir = new File("status");
 
diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java 
b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
index decf559..241b3bd 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -14,12 +14,8 @@ import org.torproject.onionoo.docs.UptimeDocument;
 import org.torproject.onionoo.docs.WeightsDocument;
 import org.torproject.onionoo.util.FormattingUtils;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,11 +31,7 @@ public class ResponseBuilder {
   private static final Logger logger =
   LoggerFactory.getLogger(ResponseBuilder.class);
 
-  private static ObjectMapper objectMapper = new ObjectMapper()
-  .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-  .setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
-  .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
-  .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+  private static ObjectMapper objectMapper = new ObjectMapper();
 
   private DocumentStore documentStore;
   private String buildRevision;
diff --git 
a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java 
b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java
index 145619d..2bc8203 100644
--- a

[tor-commits] [onionoo/master] Prepare for 6.2-1.16.0 release.

2018-08-03 Thread karsten

commit 49879eb7cc19b1e24048776e5404041e371f29f4
Author: Karsten Loesing 
Date:   Fri Aug 3 12:08:26 2018 +0200

Prepare for 6.2-1.16.0 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 4 ++--
 src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5f752d..99422f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 6.2-1.16.0 - 2018-07-??
+# Changes in version 6.2-1.16.0 - 2018-08-03
 
  * Medium changes
- Support a comma-separated list of fingerprints in the lookup
diff --git a/build.xml b/build.xml
index 1bc5734..5af2474 100644
--- a/build.xml
+++ b/build.xml
@@ -8,9 +8,9 @@
 
   
   
-  
+  
   
+value="${onionoo.protocol.version}-1.16.0"/>
   
   
relays, PrintWriter pw) {
 this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

___
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 'with_malloc_squashed'

2018-08-03 Thread nickm

commit bb1f29423263d2285e318ff190c3692b9d41b6ff
Merge: ae157b79e abde9fb42
Author: Nick Mathewson 
Date:   Fri Aug 3 07:35:23 2018 -0400

Merge branch 'with_malloc_squashed'

 changes/ticket20424 |  5 
 configure.ac| 71 -
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --cc configure.ac
index ebd415374,d414d0253..ea19e3fef
--- a/configure.ac
+++ b/configure.ac
@@@ -1793,24 -1764,71 +1791,75 @@@ AC_ARG_WITH(tcmalloc
  AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library]),
  [ tcmalloc=yes ], [ tcmalloc=no ])
  
- if test "x$tcmalloc" = "xyes"; then
-LDFLAGS="-ltcmalloc $LDFLAGS"
- fi
+ default_malloc=system
  
- using_custom_malloc=no
- if test "x$enable_openbsd_malloc" = "xyes"; then
-using_custom_malloc=yes
+ if test "x$enable_openbsd_malloc" = "xyes" ; then
+   AC_MSG_NOTICE([The --enable-openbsd-malloc argument is deprecated; use 
--with-malloc=openbsd instead.])
+   default_malloc=openbsd
  fi
+ 
  if test "x$tcmalloc" = "xyes"; then
-using_custom_malloc=yes
+   AC_MSG_NOTICE([The --with-tcmalloc argument is deprecated; use 
--with-malloc=tcmalloc instead.])
+   default_malloc=tcmalloc
  fi
- if test "$using_custom_malloc" = "no"; then
-AC_CHECK_FUNCS(mallinfo)
+ 
+ AC_ARG_WITH(malloc,
+AS_HELP_STRING([--with-malloc=[system,jemalloc,tcmalloc,openbsd]],
+   [select special malloc implementation [system]]),
+[ malloc="$with_malloc" ], [ malloc="$default_malloc" ])
+ 
+ AS_CASE([$malloc],
+   [tcmalloc], [
+   PKG_CHECK_MODULES([TCMALLOC],
+   [libtcmalloc],
+   have_tcmalloc=yes,
+   have_tcmalloc=no)
+ 
+   if test "x$have_tcmalloc" = "xno" ; then
+   AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc.])
+   fi
+ 
+   CFLAGS="$CFLAGS $TCMALLOC_CFLAGS"
+   LIBS="$TCMALLOC_LIBS $LIBS"
+   ],
+ 
+   [jemalloc], [
+   PKG_CHECK_MODULES([JEMALLOC],
+   [jemalloc],
+   have_jemalloc=yes,
+   have_jemalloc=no)
+ 
+   if test "x$have_tcmalloc" = "xno" ; then
+   AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc.])
+   fi
+ 
+   CFLAGS="$CFLAGS $JEMALLOC_CFLAGS"
+   LIBS="$JEMALLOC_LIBS $LIBS"
+   using_custom_malloc=yes
+   ],
+ 
+   [openbsd], [
+ enable_openbsd_malloc=yes
+   ],
+ 
+   [system], [
+  # handle this later, including the jemalloc fallback
+ AC_CHECK_FUNCS(mallinfo)
+   ],
+ 
+   [AC_MSG_ERROR([--with-malloc=`$with_malloc' not supported, see --help])
+ ])
+ 
+ AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes")
+ 
+ if test "$malloc" != "system"; then
+   # Tell the C compiler not to use the system allocator functions.
+   TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
  fi
 +if test "$using_custom_malloc" = "yes"; then
 +  # Tell the C compiler not to use the system allocator functions.
 +  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
 +fi
  
  # By default, we're going to assume we don't have mlockall()
  # bionic and other platforms have various broken mlockall subsystems.



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

[tor-commits] [tor/master] Mark openbsd-malloc as deprecated

2018-08-03 Thread nickm

commit 5597ddc36047a4f306a6f668235d02c069db991a
Author: Nick Mathewson 
Date:   Fri Aug 3 07:38:47 2018 -0400

Mark openbsd-malloc as deprecated
---
 changes/ticket20424 | 4 ++--
 configure.ac| 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changes/ticket20424 b/changes/ticket20424
index 123807ae2..b3b6f1afa 100644
--- a/changes/ticket20424
+++ b/changes/ticket20424
@@ -1,5 +1,5 @@
   o Minor features (compilation):
 - Tor's configure script now supports a --with-malloc= option to select
   your malloc implementation. Supported options are "tcmalloc",
-  "jemalloc", "openbsd", and "system" (the default). Addresses part of
-  ticket 20424. Based on a patch from Alex Xu.
+  "jemalloc", "openbsd" (deprecated), and "system" (the default).
+  Addresses part of ticket 20424. Based on a patch from Alex Xu.
diff --git a/configure.ac b/configure.ac
index ea19e3fef..fbe0fa5ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CANONICAL_HOST
 PKG_PROG_PKG_CONFIG
 
 AC_ARG_ENABLE(openbsd-malloc,
-   AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD.  
Linux only]))
+   AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD.  
Linux only. Deprecated: see --with-malloc]))
 AC_ARG_ENABLE(static-openssl,
AS_HELP_STRING(--enable-static-openssl, [link against a static openssl 
library. Requires --with-openssl-dir]))
 AC_ARG_ENABLE(static-libevent,
@@ -1788,7 +1788,7 @@ if test "$tor_cv_uint8_uchar" = "no"; then
 fi
 
 AC_ARG_WITH(tcmalloc,
-AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library]),
+AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. 
Deprecated; see --with-malloc]),
 [ tcmalloc=yes ], [ tcmalloc=no ])
 
 default_malloc=system
@@ -1839,6 +1839,7 @@ AS_CASE([$malloc],
   ],
 
   [openbsd], [
+AC_WARN([The openbsd malloc port is deprecated in Tor 0.3.5 and will be 
removed in a future version.])
 enable_openbsd_malloc=yes
   ],
 

___
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 --with-malloc option.

2018-08-03 Thread nickm

commit abde9fb426c7d6d0dbdaccc724c3b4257d99ad30
Author: Nick Mathewson 
Date:   Wed Jul 11 09:28:23 2018 -0400

Add a --with-malloc option.

Based on a patch from Hello71 on ticket 20424.

This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.

squash! Add a --with-malloc option.

Edit changelog file to fix a typo and credit Alex Xu in preferred format.
---
 changes/ticket20424 |  5 
 configure.ac| 71 -
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/changes/ticket20424 b/changes/ticket20424
new file mode 100644
index 0..123807ae2
--- /dev/null
+++ b/changes/ticket20424
@@ -0,0 +1,5 @@
+  o Minor features (compilation):
+- Tor's configure script now supports a --with-malloc= option to select
+  your malloc implementation. Supported options are "tcmalloc",
+  "jemalloc", "openbsd", and "system" (the default). Addresses part of
+  ticket 20424. Based on a patch from Alex Xu.
diff --git a/configure.ac b/configure.ac
index 532476672..d414d0253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,8 +82,6 @@ if test "$enable_memory_sentinels" = "no"; then
[Defined if we're turning off memory safety code to look for bugs])
 fi
 
-AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes")
-
 AC_ARG_ENABLE(asciidoc,
  AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building 
of manpages)]),
  [case "${enableval}" in
@@ -1766,19 +1764,70 @@ AC_ARG_WITH(tcmalloc,
 AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library]),
 [ tcmalloc=yes ], [ tcmalloc=no ])
 
-if test "x$tcmalloc" = "xyes"; then
-   LDFLAGS="-ltcmalloc $LDFLAGS"
-fi
+default_malloc=system
 
-using_custom_malloc=no
-if test "x$enable_openbsd_malloc" = "xyes"; then
-   using_custom_malloc=yes
+if test "x$enable_openbsd_malloc" = "xyes" ; then
+  AC_MSG_NOTICE([The --enable-openbsd-malloc argument is deprecated; use 
--with-malloc=openbsd instead.])
+  default_malloc=openbsd
 fi
+
 if test "x$tcmalloc" = "xyes"; then
-   using_custom_malloc=yes
+  AC_MSG_NOTICE([The --with-tcmalloc argument is deprecated; use 
--with-malloc=tcmalloc instead.])
+  default_malloc=tcmalloc
 fi
-if test "$using_custom_malloc" = "no"; then
-   AC_CHECK_FUNCS(mallinfo)
+
+AC_ARG_WITH(malloc,
+   AS_HELP_STRING([--with-malloc=[system,jemalloc,tcmalloc,openbsd]],
+  [select special malloc implementation [system]]),
+   [ malloc="$with_malloc" ], [ malloc="$default_malloc" ])
+
+AS_CASE([$malloc],
+  [tcmalloc], [
+  PKG_CHECK_MODULES([TCMALLOC],
+   [libtcmalloc],
+   have_tcmalloc=yes,
+   have_tcmalloc=no)
+
+  if test "x$have_tcmalloc" = "xno" ; then
+  AC_MSG_ERROR([Unable to find tcmalloc requested by --with-malloc.])
+  fi
+
+  CFLAGS="$CFLAGS $TCMALLOC_CFLAGS"
+  LIBS="$TCMALLOC_LIBS $LIBS"
+  ],
+
+  [jemalloc], [
+  PKG_CHECK_MODULES([JEMALLOC],
+   [jemalloc],
+   have_jemalloc=yes,
+   have_jemalloc=no)
+
+  if test "x$have_tcmalloc" = "xno" ; then
+  AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc.])
+  fi
+
+  CFLAGS="$CFLAGS $JEMALLOC_CFLAGS"
+  LIBS="$JEMALLOC_LIBS $LIBS"
+  using_custom_malloc=yes
+  ],
+
+  [openbsd], [
+enable_openbsd_malloc=yes
+  ],
+
+  [system], [
+ # handle this later, including the jemalloc fallback
+AC_CHECK_FUNCS(mallinfo)
+  ],
+
+  [AC_MSG_ERROR([--with-malloc=`$with_malloc' not supported, see --help])
+])
+
+AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes")
+
+if test "$malloc" != "system"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
 fi
 
 # By default, we're going to assume we don't have mlockall()



___
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.3] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.9] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.4] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-03 Thread nickm

commit be8e56c231755069fae03eb13a4ddd9fba4f6563
Merge: 861d69001 2a6c1585b
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-03 Thread nickm

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-08-03 Thread nickm

commit 7a74d5a87ed04a15b6f19d73b145c9f58931e3f8
Merge: eab0d9242 be8e56c23
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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.4] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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.3] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.3] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-03 Thread nickm

commit 40105254840e4f460c193f262125d7ba454209a2
Merge: 4902cccab 2a6c1585b
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-03 Thread nickm

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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.4] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-08-03 Thread nickm

commit d5f0cbce9016965e9e9cae459c2241bf0fa83cc8
Merge: 4632ad431 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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.4] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.9] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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] Merge branch 'maint-0.3.2' into release-0.3.2

2018-08-03 Thread nickm

commit 920a7b37a5d05266c705a34965cbd0fb29e4da66
Merge: edfa74688 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

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

[tor-commits] [tor/maint-0.2.9] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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.3] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



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

[tor-commits] [tor/maint-0.2.9] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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.4] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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' into maint-0.3.3

2018-08-03 Thread nickm

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.4] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-03 Thread nickm

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.3] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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.3] Merge branch 'maint-0.2.9' into maint-0.3.2

2018-08-03 Thread nickm

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c
Merge: fea35ddf0 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.3' into maint-0.3.4

2018-08-03 Thread nickm

commit be8e56c231755069fae03eb13a4ddd9fba4f6563
Merge: 861d69001 2a6c1585b
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




___
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.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-03 Thread nickm

commit be8e56c231755069fae03eb13a4ddd9fba4f6563
Merge: 861d69001 2a6c1585b
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

___
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] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

2018-08-03 Thread nickm

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef
Merge: 6443812e3 16bdbddc2
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:39 2018 -0400

Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)



___
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.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-03 Thread nickm

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8
Merge: eb604f5fa 4856a6e6c
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/master] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



___
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] When setting a nonstandard malloc, disable the system malloc.

2018-08-03 Thread nickm

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1
Author: Nick Mathewson 
Date:   Wed Jul 11 09:36:24 2018 -0400

When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.
---
 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal
new file mode 100644
index 0..eb7886233
--- /dev/null
+++ b/changes/bug20424_029_minimal
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
+  the compiler not to include the system malloc implementation. Fixes bug
+  20424; bugfix on 0.2.0.20-rc.
diff --git a/configure.ac b/configure.ac
index 279660d9b..d70032992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ fi
 if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo)
 fi
+if test "$using_custom_malloc" = "yes"; then
+  # Tell the C compiler not to use the system allocator functions.
+  TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc 
-fno-builtin-calloc -fno-builtin-free])
+fi
 
 # By default, we're going to assume we don't have mlockall()
 # bionic and other platforms have various broken mlockall subsystems.



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

2018-08-03 Thread nickm

commit ae157b79e76695b8afe580da033789ba92b7ffdf
Merge: 622a057e7 be8e56c23
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.4'

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 2 files changed, 8 insertions(+)

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

[tor-commits] [torspec/master] Merge remote-tracking branch 'rl1987/doc26903'

2018-08-03 Thread nickm

commit 78f32c6f6f1ae0b0f64a628e62ce64877a596c74
Merge: 684c46b 4f6a391
Author: Nick Mathewson 
Date:   Fri Aug 3 07:07:10 2018 -0400

Merge remote-tracking branch 'rl1987/doc26903'

 control-spec.txt | 51 ++-
 1 file changed, 42 insertions(+), 9 deletions(-)

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

[tor-commits] [torspec/master] Document all of GETINFO net/listeners/*

2018-08-03 Thread nickm

commit 4f6a3915bec6d0b241abf623461814bcc68ca6ff
Author: rl1987 
Date:   Tue Jul 24 13:50:58 2018 +0300

Document all of GETINFO net/listeners/*
---
 control-spec.txt | 51 ++-
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index cc75cbc..e7a5b79 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -864,15 +864,8 @@
   this is *not* the latest descriptors we've published, but rather what we
   would generate if we needed to make a new descriptor right now.
 
-"net/listeners/or"
-"net/listeners/dir"
-"net/listeners/socks"
-"net/listeners/trans"
-"net/listeners/natd"
-"net/listeners/dns"
-"net/listeners/control"
-"net/listeners/extor"
-"net/listeners/httptunnel"
+"net/listeners/*"
+
   A quoted, space-separated list of the locations where Tor is listening
   for connections of the specified type. These can contain IPv4
   network address...
@@ -889,6 +882,46 @@
 
   [New in Tor 0.2.2.26-beta.]
 
+"net/listeners/or"
+
+  Listeners for OR connections. Talks Tor protocol as described in
+  tor-spec.txt.
+
+"net/listeners/dir"
+
+  Listeners for Tor directory protocol, as decribed in dir-spec.txt.
+
+"net/listeners/socks"
+
+  Listeners for onion proxy connections that talk SOCKS4/4a/5 protocol.
+
+"net/listeners/trans"
+
+  Listeners for transparent connections redirected by firewall, such as
+  pf or netfilter.
+
+"net/listeners/natd"
+
+  Listeners for transparent connections redirected by natd.
+
+"net/listeners/dns"
+
+  Listeners for a subset of DNS protocol that Tor network supports.
+
+"net/listeners/control"
+
+  Listeners for Tor control protocol, described herein.
+
+"net/listeners/extor"
+
+  Listeners corresponding to Extended ORPorts for integration with
+  pluggable transports. See proposals 180 and 196.
+
+"net/listeners/httptunnel"
+
+  Listeners for onion proxy connections that leverage HTTP CONNECT
+  tunnelling.
+
   [The extor and httptunnel lists were added in 0.3.2.12, 0.3.3.10, and
   0.3.4.6-rc.]
 



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

[tor-commits] [tor/master] Increase line coverage in libtor-string to 100%

2018-08-03 Thread nickm

commit ee12c11dd4e81d44020ded9f275ec030de0a2d1f
Author: Nick Mathewson 
Date:   Tue Jul 17 16:47:32 2018 -0400

Increase line coverage in libtor-string to 100%

(On linux.)
---
 src/lib/string/printf.c |  2 +-
 src/test/test_util.c| 15 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/lib/string/printf.c b/src/lib/string/printf.c
index 82d38242d..e23da69d0 100644
--- a/src/lib/string/printf.c
+++ b/src/lib/string/printf.c
@@ -101,7 +101,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
   /* If the platform gives us one, use it. */
   int r = vasprintf(&strp_tmp, fmt, args);
   if (r < 0)
-*strp = NULL;
+*strp = NULL; // LCOV_EXCL_LINE -- no cross-platform way to force this
   else
 *strp = strp_tmp;
   return r;
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 99fee4c5a..888038bea 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -3163,6 +3163,21 @@ test_util_sscanf(void *arg)
   test_feq(d3, -900123123.2000787);
   test_feq(d4, 3.2);
 
+  /* missing float */
+  r = tor_sscanf("3 ", "%d %lf", &int1, &d1);
+  tt_int_op(r, OP_EQ, 1);
+  tt_int_op(int1, OP_EQ, 3);
+
+  /* not a float */
+  r = tor_sscanf("999 notafloat", "%d %lf", &int1, &d1);
+  tt_int_op(r, OP_EQ, 1);
+  tt_int_op(int1, OP_EQ, 999);
+
+  /* %s but no buffer. */
+  char *nullbuf = NULL;
+  r = tor_sscanf("hello", "%3s", nullbuf);
+  tt_int_op(r, OP_EQ, 0);
+
  done:
   tor_free(huge);
 }



___
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 'public/string_coverage'

2018-08-03 Thread nickm

commit 622a057e7e5d9f757d040283c7089d1fab847ae3
Merge: af9787944 ee12c11dd
Author: Nick Mathewson 
Date:   Fri Aug 3 07:03:29 2018 -0400

Merge remote-tracking branch 'public/string_coverage'

 src/lib/string/printf.c |  2 +-
 src/test/test_util.c| 15 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

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

[tor-commits] [tor-browser-build/master] Bug: 27020: RBM build fails with runc version 1.0.1

2018-08-03 Thread boklm

commit 3960ad5d91701ef9b22e57eef8532e7a2e19b9db
Author: Richard Pospesel 
Date:   Wed Aug 1 11:29:46 2018 -0700

Bug: 27020: RBM build fails with runc version 1.0.1

runc version on Ubuntu 18.04 is 1.0.1 which is not currently handled in
rbm.conf, so the runc_spec100 flag does not get set properly.  This
patch changes it so the runc_spec100 flag is set if a spec string
greater than 1.0.0 is found.
---
 rbm.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rbm.conf b/rbm.conf
index d046d86..8cfa5e2 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -390,11 +390,11 @@ ENV:
 my ($out) = capture_exec('sudo', 'runc', '--version');
 return !($out =~ m/^runc version 0.1.1/);
   },
-  # runc_spec100 is true if runc spec is exactly 1.0.0
+  # runc_spec100 is true if runc spec is at least 1.0.0
   # We will need to update this when there is a new spec version available
   runc_spec100 => sub {
 my ($out) = capture_exec('sudo', 'runc', '--version');
-return $out =~ m/^spec: 1\.0\.0$/m;
+return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+$/m;
   },
 },
   )

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

[tor-commits] [metrics-web/master] Fix bug in generating Tor Messenger CSV file.

2018-08-03 Thread karsten

commit afc2fc4fa5f19b592dd8f09d6397fd244adfbe91
Author: Karsten Loesing 
Date:   Fri Aug 3 10:32:57 2018 +0200

Fix bug in generating Tor Messenger CSV file.
---
 src/main/R/rserver/graphs.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index 56c8a55..12a80e9 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -1489,7 +1489,8 @@ plot_webstats_tm <- function(start_p, end_p, path_p) {
 write_webstats_tm <- function(start_p = NULL, end_p = NULL, path_p) {
   prepare_webstats_tm(start_p, end_p) %>%
 rename(date = log_date) %>%
-spread(request_type, count) %>%
+mutate(request_type = factor(request_type, levels = c("tmid", "tmup"))) %>%
+spread(request_type, count, drop = FALSE) %>%
 rename(initial_downloads = tmid, update_pings = tmup) %>%
 write.csv(path_p, quote = FALSE, row.names = FALSE, na = "")
 }

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

85 matches

Mail list logo