date:20160707

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

2016-07-07 Thread translation

commit fd0ea14dd2924b8014dbdd9032163d53ffe6
Author: Translation commit bot 
Date:   Thu Jul 7 20:45:34 2016 +

Update translations for liveusb-creator
---
 sk_SK/sk_SK.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index efca56f..f99a2b5 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-07-07 20:11+\n"
+"PO-Revision-Date: 2016-07-07 20:28+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -159,41 +159,41 @@ msgstr "Preberanie %s..."
 
 #: ../liveusb/creator.py:1192
 msgid "Drive is a loopback, skipping MBR reset"
-msgstr ""
+msgstr "Zariadenie je loopback, preskakujem MBR reset"
 
 #: ../liveusb/creator.py:837
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
-msgstr ""
+msgstr "SpÃºÅ¡Å¥a sa unmount_device pre '%(device)s'"
 
 #: ../liveusb/creator.py:1272
 msgid "Error probing device"
-msgstr ""
+msgstr "Chyba pri skÃºÅ¡anÃ zariadenia"
 
 #: ../liveusb/gui.py:213
 msgid ""
 "Error: Cannot set the label or obtain the UUID of your device.  Unable to "
 "continue."
-msgstr ""
+msgstr "Chyba: nie je moÅ¾nÃ© nastaviÅ¥ menovku alebo zÃskaÅ¥ UUID VaÅ¡eho 
zariadenia. Nie je moÅ¾nÃ© pokraÄovaÅ¥."
 
 #: ../liveusb/creator.py:393
 msgid ""
 "Error: The SHA1 of your Live CD is invalid.  You can run this program with "
 "the --noverify argument to bypass this verification check."
-msgstr ""
+msgstr "Chyba: SHA1 VaÅ¡eho Live CD je neplatnÃ©. MoÅ¾ete spustiÅ¥ tento 
program s parametrom --noverify, aby ste tÃºto kontrolu obiÅ¡li."
 
 #: ../liveusb/creator.py:155
 msgid "Extracting live image to the target device..."
-msgstr ""
+msgstr "RozbaÄ¾ujem live obraz do cieÄ¾ovÃ©ho zariadenia..."
 
 #: ../liveusb/creator.py:1140
 #, python-format
 msgid "Formatting %(device)s as FAT32"
-msgstr ""
+msgstr "FormÃ¡tovanie %(device)s ako FAT32"
 
 #: ../liveusb/creator.py:150
 msgid "ISO MD5 checksum passed"
-msgstr ""
+msgstr "ISO MD5 checksum preÅ¡iel"
 
 #: ../liveusb/creator.py:148
 msgid "ISO MD5 checksum verification failed"

___
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

2016-07-07 Thread translation

commit f8962f028a0bb7fb5b07296437369f47784467f3
Author: Translation commit bot 
Date:   Thu Jul 7 20:15:36 2016 +

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

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index 4966c98..efca56f 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-07-07 19:40+\n"
+"PO-Revision-Date: 2016-07-07 20:11+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgid ""
 "The encrypted persistent storage of the Tails USB stick that you are 
currently using is not copied.\n"
 "\n"
 ""
-msgstr ""
+msgstr "\nAktualizovaÅ¥ inÃ½ USB kÄ¾ÃºÄ so systÃ©mom Tails na verziu 
ISO obrazu.\n\nÅ ifrovanÃ½ stÃ¡ly oddiel na USB kÄ¾ÃºÄi s obsahom 
Tails ostÃ¡va aj po aktualizÃ¡cii nezmenenÃ½.\n\nÅ ifrovanÃ½ stÃ¡ly 
oddiel na USB kÄ¾ÃºÄi s obsahom Tails nebude po aktualizÃ¡cii 
skopÃrovanÃ½.\n\n"
 
 #: ../liveusb/dialog.py:161
 msgid "Alt+B"
@@ -113,7 +113,7 @@ msgid ""
 "will be able to store data and make permanent modifications to your live "
 "operating system.  Without it, you will not be able to save data that will "
 "persist after a reboot."
-msgstr ""
+msgstr "VyÄlenenÃm Å¡peciÃ¡lneho miesta pre stÃ¡lu pamÃ¤Å¥ na VaÅ¡om USB 
kÄ¾ÃºÄi budete schopnÃ½ ukladaÅ¥ dÃ¡ta a robiÅ¥ trvalÃ© zmeny v operaÄnom 
systÃ©me. Bez toho nebudete maÅ¥ moÅ¾nosÅ¥ ukladaÅ¥ dÃ¡ta, ktorÃ© ostanÃº aj po 
opÃ¤tovnom spustenÃ systÃ©mu."
 
 #: ../liveusb/creator.py:1196 ../liveusb/creator.py:1459
 #, python-format
@@ -122,7 +122,7 @@ msgstr "Prebieha vÃ½poÄet SHA1 pre %s"
 
 #: ../liveusb/creator.py:1407
 msgid "Cannot find"
-msgstr ""
+msgstr "Nie je moÅ¾nÃ© nÃ¡jsÅ¥"
 
 #: ../liveusb/creator.py:560
 #, python-format
@@ -132,17 +132,17 @@ msgstr "Nie je moÅ¾nÃ© nÃ¡jsÅ¥ zariadenie %s"
 #: ../liveusb/creator.py:417
 #, python-format
 msgid "Creating %sMB persistent overlay"
-msgstr ""
+msgstr "VytvÃ¡ra sa %sMB trvalej pamÃ¤te"
 
 #: ../liveusb/gui.py:582
 msgid ""
 "Device is not yet mounted, so we cannot determine the amount of free space."
-msgstr ""
+msgstr "Zariadenie eÅ¡te nebolo pripojenÃ©, takÅ¾e nie je moÅ¾nÃ© urÄiÅ¥ 
veÄ¾kosÅ¥ voÄ¾nÃ©ho miesta."
 
 #: ../liveusb/dialog.py:164
 #, python-format
 msgid "Download %(distribution)s"
-msgstr ""
+msgstr "SÅ¥ahujem %(distribution)s"
 
 #: ../liveusb/gui.py:778
 msgid "Download complete!"

___
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

2016-07-07 Thread translation

commit 4c5f916efbfb105aa92d138e882ce0e946b8bd1d
Author: Translation commit bot 
Date:   Thu Jul 7 19:45:34 2016 +

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

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index c3b2987..4966c98 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-07-07 19:11+\n"
+"PO-Revision-Date: 2016-07-07 19:40+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgid ""
 "The encrypted persistent storage of the Tails USB stick that you are 
currently using is not copied.\n"
 "\n"
 ""
-msgstr "\nPre inÅ¡talÃ¡ciu Tails na inÃ½ USB kÄ¾ÃºÄ skopÃrujte 
systÃ©m Tail, ktorÃ½ prÃ¡ve teraz pouÅ¾Ãvate\n\nUSB kÄ¾ÃºÄ, na 
ktorÃ½ inÅ¡talujete bude sformÃ¡tovanÃ½ a vÅ¡etky dÃ¡ta budÃº 
stratenÃ©.\n\nÅ ifrovanÃ¡ partÃcia na USB kÄ¾ÃºÄi, ktorÃº teraz 
pouÅ¾Ãvate, nebude skopÃrovanÃ¡.\n\n"
+msgstr "\nPre inÅ¡talÃ¡ciu Tails na inÃ½ USB kÄ¾ÃºÄ skopÃrujte 
systÃ©m Tail, ktorÃ½ prÃ¡ve teraz pouÅ¾Ãvate\n\nUSB kÄ¾ÃºÄ, na 
ktorÃ½ inÅ¡talujete bude sformÃ¡tovanÃ½ a vÅ¡etky dÃ¡ta budÃº 
stratenÃ©.\n\nÅ ifrovanÃ½ oddiel na USB kÄ¾ÃºÄi, ktorÃ½ teraz 
pouÅ¾Ãvate, nebude skopÃrovanÃ½.\n\n"
 
 #: ../liveusb/launcher_ui.py:157
 msgid ""
@@ -85,7 +85,7 @@ msgid ""
 "\n"
 "\n"
 ""
-msgstr ""
+msgstr "\nAktualizovaÅ¥ inÃ½ Tails na USB kÄ¾ÃºÄi na na verziu, 
ktorÃº teraz pouÅ¾Ãvate.\n\nÅ ifrovanÃ½ stÃ¡ly oddiel na USB kÄ¾ÃºÄi 
s obsahom Tails ostÃ¡va aj po aktualizÃ¡cii nezmenenÃ½.\n\nÅ ifrovanÃ½ 
stÃ¡ly oddiel na USB kÄ¾ÃºÄi s obsahom Tails nebude po aktualizÃ¡cii 
skopÃrovanÃ½.\n\n\n"
 
 #: ../liveusb/launcher_ui.py:159
 msgid ""
@@ -105,7 +105,7 @@ msgstr "Alt+B"
 
 #: ../liveusb/dialog.py:160
 msgid "Browse"
-msgstr ""
+msgstr "PrezeraÅ¥"
 
 #: ../liveusb/dialog.py:167
 msgid ""

___
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

2016-07-07 Thread translation

commit d359a935a2f9807b031bcfd9510b053544253a4c
Author: Translation commit bot 
Date:   Thu Jul 7 19:15:33 2016 +

Update translations for liveusb-creator
---
 sk_SK/sk_SK.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index 9f6392d..c3b2987 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-07-07 18:45+\n"
+"PO-Revision-Date: 2016-07-07 19:11+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +41,17 @@ msgstr "%(filename)s oznaÄenÃ½ch"
 #: ../liveusb/gui.py:424
 #, python-format
 msgid "%(size)s %(label)s"
-msgstr ""
+msgstr "%(size)s %(label)s"
 
 #: ../liveusb/gui.py:430
 #, python-format
 msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
-msgstr ""
+msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
 
 #: ../liveusb/creator.py:1097
 #, python-format
 msgid "%s already bootable"
-msgstr ""
+msgstr "%s je bootovateÄ¾nÃ©"
 
 #: ../liveusb/launcher_ui.py:160
 msgid ""
@@ -60,7 +60,7 @@ msgid ""
 "p, li { white-space: pre-wrap; }\n"
 "\n"
 "Need 
help? Read the documentation."
-msgstr ""
+msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\n\n\np, li { 
white-space: pre-wrap; }\n\n\n\nPotrebujete pomoc? PreÄÃtajte si dokumentÃ¡cia."
 
 #: ../liveusb/launcher_ui.py:155
 msgid ""
@@ -72,7 +72,7 @@ msgid ""
 "The encrypted persistent storage of the Tails USB stick that you are 
currently using is not copied.\n"
 "\n"
 ""
-msgstr ""
+msgstr "\nPre inÅ¡talÃ¡ciu Tails na inÃ½ USB kÄ¾ÃºÄ skopÃrujte 
systÃ©m Tail, ktorÃ½ prÃ¡ve teraz pouÅ¾Ãvate\n\nUSB kÄ¾ÃºÄ, na 
ktorÃ½ inÅ¡talujete bude sformÃ¡tovanÃ½ a vÅ¡etky dÃ¡ta budÃº 
stratenÃ©.\n\nÅ ifrovanÃ¡ partÃcia na USB kÄ¾ÃºÄi, ktorÃº teraz 
pouÅ¾Ãvate, nebude skopÃrovanÃ¡.\n\n"
 
 #: ../liveusb/launcher_ui.py:157
 msgid ""

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

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

2016-07-07 Thread translation

commit 446824926e0f575935e2946dd70c89d53579f383
Author: Translation commit bot 
Date:   Thu Jul 7 18:45:27 2016 +

Update translations for https_everywhere
---
 sk_SK/ssl-observatory.dtd | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sk_SK/ssl-observatory.dtd b/sk_SK/ssl-observatory.dtd
index 23aa1a4..e8a17df 100644
--- a/sk_SK/ssl-observatory.dtd
+++ b/sk_SK/ssl-observatory.dtd
@@ -66,10 +66,11 @@ Mouseover the options for further details:">-->
 
 https://www.something.com, the certificate
-received by the Observatory will indicate that somebody visited
-www.something.com, but not who visited the site, or what specific page they
-looked at.  Mouseover the options for further details:">
+"Ak naprÃklad navÅ¡tÃvite https://www.something.com, tak certifikÃ¡t, 
+ktorÃ½ prÃde do Observatory ukÃ¡Å¾e, Å¾e
+niekto navÅ¡tÃvil
+www.something.com, ale nie kto ju navÅ¡tÃvil alebo na ktorÃº konkrÃ©tnu 
strÃ¡nku
+sa pozeral. Pre bliÅ¾Å¡ie informÃ¡cie ukÃ¡Å¾te kurzorom na moÅ¾nosti.">
 
 
 
@@ -83,7 +84,7 @@ looked at.  Mouseover the options for further details:">
 "OdoslaÅ¥ a skontrolovaÅ¥ certifikÃ¡ty pre neverejnÃ© DNS nÃ¡zvy">
 
 
+"PokiaÄ¾ nie je tÃ¡to moÅ¾nosÅ¥ zaÅ¡krtnutÃ¡, Observatory nebude 
zaznemenÃ¡vaÅ¥ nÃ¡zvy certifikÃ¡tov, ktorÃ© nenÃ¡jde v DNS systÃ©me.  ">
 
 
 

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

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

2016-07-07 Thread translation

commit 229c608c9905fb8eb964250c6988a65b080f5848
Author: Translation commit bot 
Date:   Thu Jul 7 18:45:35 2016 +

Update translations for https_everywhere_completed
---
 sk_SK/ssl-observatory.dtd | 103 ++
 1 file changed, 103 insertions(+)

diff --git a/sk_SK/ssl-observatory.dtd b/sk_SK/ssl-observatory.dtd
new file mode 100644
index 000..e8a17df
--- /dev/null
+++ b/sk_SK/ssl-observatory.dtd
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://www.something.com, tak certifikÃ¡t, 
+ktorÃ½ prÃde do Observatory ukÃ¡Å¾e, Å¾e
+niekto navÅ¡tÃvil
+www.something.com, ale nie kto ju navÅ¡tÃvil alebo na ktorÃº konkrÃ©tnu 
strÃ¡nku
+sa pozeral. Pre bliÅ¾Å¡ie informÃ¡cie ukÃ¡Å¾te kurzorom na moÅ¾nosti.">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2016-07-07 Thread translation

commit d0933a804c18ea93595b5d85ad4cf2f72f8cc857
Author: Translation commit bot 
Date:   Thu Jul 7 18:45:39 2016 +

Update translations for liveusb-creator
---
 sk_SK/sk_SK.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index de7097b..9f6392d 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dasa M , 2016
 # MariÃ¡n MiÅ¾ik , 2015
 # once, 2014
 msgid ""
@@ -10,8 +11,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-03-21 16:31+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-07-07 18:45+\n"
+"Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,16 +22,16 @@ msgstr ""
 
 #: ../liveusb/gui.py:451
 msgid "\"Clone & Install\""
-msgstr ""
+msgstr "\"KlonovaÅ¥ & inÅ¡talovaÅ¥\""
 
 #: ../liveusb/gui.py:453
 msgid "\"Install from ISO\""
-msgstr ""
+msgstr "\"InÅ¡talovaÅ¥ z ISO\""
 
 #: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
 #, python-format
 msgid "%(distribution)s Installer"
-msgstr "%(distribution)s InÅ¡takÃ¡tor"
+msgstr "%(distribution)s InÅ¡talÃ¡tor"
 
 #: ../liveusb/gui.py:804
 #, python-format

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

[tor-commits] [metrics-lib/master] Create javadoc jar.

2016-07-07 Thread karsten

commit e6fb04897bc917e0de2a895bbf96a962b614081a
Author: Karsten Loesing 
Date:   Thu Jul 7 20:20:12 2016 +0200

Create javadoc jar.
---
 build.xml | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 4043d76..3099409 100644
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,8 @@
   
   
+  
   
   
@@ -80,6 +82,7 @@
 
 
 
+
 
   
 
@@ -169,7 +172,7 @@
 
   
 
-  
+  
 
   
   
@@ -194,6 +197,15 @@
value="${release.version}-${git.revision}"/>
   
 
+
+  
+  
+
+
+
+  
+
   
 
   
@@ -205,6 +217,7 @@
   
 
 
+
   
 
   
@@ -214,6 +227,7 @@
   
 
 
+
 
 
 



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

[tor-commits] [metrics-lib/master] Bump version to 1.3.0-dev.

2016-07-07 Thread karsten

commit ad9a1065b4e53bf3393dcd8b7e77ffbd7afeca0d
Author: Karsten Loesing 
Date:   Wed Jul 6 10:30:24 2016 +0200

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

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

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

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

2016-07-07 Thread translation

commit e99b0d3d389bbd37ad2c9727a48adb1d6a46dd69
Author: Translation commit bot 
Date:   Thu Jul 7 18:15:31 2016 +

Update translations for https_everywhere
---
 sk_SK/ssl-observatory.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK/ssl-observatory.dtd b/sk_SK/ssl-observatory.dtd
index af038ff..23aa1a4 100644
--- a/sk_SK/ssl-observatory.dtd
+++ b/sk_SK/ssl-observatory.dtd
@@ -42,13 +42,13 @@ pripojenÃ½ k veÄ¾mi neodbytnej firemnej sieti:">
 "Pri objavenÃ sa novÃ©ho certifikÃ¡tu, oznÃ¡miÅ¥ Observatory, ku ktorÃ©mu ISP 
ste pripojenÃ.">
 
 
+"To naÄita a odoÅ¡le ÄÃslo autonÃ³mneho systÃ©mu VaÅ¡ej siete. 
To nÃ¡m pomÃ´Å¾e lokalizovaÅ¥ Ãºtoky na HTTPS a urÄiÅ¥, Äi mÃ¡me hlÃ¡senia zo 
sietÃ na miestach ako je IrÃ¡n a SÃ½ria, kde sÃº Ãºtoky relatÃvne ÄastÃ©.">
 
 
 
 
+"To porovnÃ¡ zadanÃ© certifikÃ¡ty so zoznamom neplatnÃ½ch certifikÃ¡tov. 
BohuÅ¾iaÄ¾ nemÃ´Å¾eme zaruÄiÅ¥, Å¾e dokÃ¡Å¾eme oznaÄiÅ¥ kaÅ¾dÃ½ zruÅ¡enÃ½ 
certifikÃ¡t, ale pokiaÄ¾ sa VÃ¡m zobrazÃ varovanie, existuje vysokÃ¡ 
pravdepodobnosÅ¥, Å¾e nieÄo nie je v poriadku.">
 
 
 

___
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

2016-07-07 Thread translation

commit bf9d887991bd82a56cd9e154ee18924692461e43
Author: Translation commit bot 
Date:   Thu Jul 7 18:15:04 2016 +

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

diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index da7ba71..fa40fe0 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/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=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-07-07 17:38+\n"
+"PO-Revision-Date: 2016-07-07 17:49+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -330,7 +330,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr ""
+msgstr "Pre vloÅ¾enie premostenÃ do prehliadaÄa Tor postupujte podÄ¾a 
inÅ¡trukciÃ na %s Tor Browser,\nstrÃ¡nke %s pre stiahnutie a spustenie 
prehliadaÄa\nTor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

___
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

2016-07-07 Thread translation

commit b68a840d98aac84a7538631b2b3059d8fc30a9dc
Author: Translation commit bot 
Date:   Thu Jul 7 18:15:10 2016 +

Update translations for bridgedb_completed
---
 sk_SK/LC_MESSAGES/bridgedb.po | 323 +++---
 1 file changed, 174 insertions(+), 149 deletions(-)

diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index a667857..fa40fe0 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -1,21 +1,22 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# Dasa M , 2016
 # once, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+\n"
-"PO-Revision-Date: 2014-10-15 17:11+\n"
-"Last-Translator: once\n"
-"Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-07-07 17:49+\n"
+"Last-Translator: Dasa M \n"
+"Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
@@ -30,57 +31,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "PrepÃ¡Äte! Pri spracovanÃ vaÅ¡ej poÅ¾iadavky sa vyskytla chyba."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "NahlÃ¡siÅ¥ chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ZdrojovÃ½ kÃ³d"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "ZÃ¡znam zmien"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄiÅ¥ vÅ¡etko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ZobraziÅ¥ QR KÃ³d"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR KÃ³d pre premostenia"
+
+#. 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 "Ejha!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "VyzerÃ¡ to, Å¾e pri zÃskavanÃ VaÅ¡eho QR KÃ³du nastala chyba. "
+
+#: 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 "Tento QR kÃ³d obsahuje premostenia. Naskenujte ho ÄÃtaÄkou QR 
kÃ³du, aby ste ich skopÃrovali do VÃ¡Å¡ho mobilu alebo inÃ½ch zariadenÃ."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Å½iadne premostenia nie sÃº prÃ¡ve dostupnÃ©..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Mohli by ste skÃºsiÅ¥ %s vrÃ¡tiÅ¥ sa naspÃ¤Å¥ %s a zvoliÅ¥ inÃ½ typ 
premostenia!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "PrevziaÅ¥ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskaÅ¥ %s premostenia %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s pridajte premostenia do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#:

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

2016-07-07 Thread translation

commit 4cef924b5f58f7a4066dc393dfe795e21cc5a053
Author: Translation commit bot 
Date:   Thu Jul 7 17:45:31 2016 +

Update translations for https_everywhere
---
 sk_SK/https-everywhere.dtd | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/sk_SK/https-everywhere.dtd b/sk_SK/https-everywhere.dtd
index 5263373..c43e7b3 100644
--- a/sk_SK/https-everywhere.dtd
+++ b/sk_SK/https-everywhere.dtd
@@ -39,19 +39,19 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

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

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

2016-07-07 Thread translation

commit 09f84c5ffe349aa0e849bb57bd7cc08d78e93594
Author: Translation commit bot 
Date:   Thu Jul 7 17:45:36 2016 +

Update translations for https_everywhere_completed
---
 sk_SK/https-everywhere.dtd | 32 
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/sk_SK/https-everywhere.dtd b/sk_SK/https-everywhere.dtd
index 2d62595..c43e7b3 100644
--- a/sk_SK/https-everywhere.dtd
+++ b/sk_SK/https-everywhere.dtd
@@ -3,20 +3,26 @@
 
 
 
+
 
+
 
+
+
 
 
 
 
 
 
+
 
 
 
 
 
 
+
 
 
 
@@ -33,17 +39,19 @@
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
 
-
-
-

___
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

2016-07-07 Thread translation

commit 6c3d642b522097057d67a42edd73dae77af8a828
Author: Translation commit bot 
Date:   Thu Jul 7 17:45:03 2016 +

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

diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index 47f9ea1..da7ba71 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/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=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-07-06 20:49+\n"
+"PO-Revision-Date: 2016-07-07 17:38+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "ZobraziÅ¥ QR KÃ³d"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "QR KÃ³d pre premostenia"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -74,13 +74,13 @@ msgstr "Ejha!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "VyzerÃ¡ to, Å¾e pri zÃskavanÃ VaÅ¡eho QR KÃ³du nastala chyba. "
 
 #: 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 ""
+msgstr "Tento QR kÃ³d obsahuje premostenia. Naskenujte ho ÄÃtaÄkou QR 
kÃ³du, aby ste ich skopÃrovali do VÃ¡Å¡ho mobilu alebo inÃ½ch zariadenÃ."
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."

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

[tor-commits] [trunnel/master] Minor typo fixes in manual

2016-07-07 Thread nickm

commit 0c763b0906ffcc844a2649f010b8f8417e49b674
Author: Nick Mathewson 
Date:   Thu Jul 7 13:34:02 2016 -0400

Minor typo fixes in manual
---
 doc/trunnel.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/trunnel.md b/doc/trunnel.md
index e17fa22..744e202 100644
--- a/doc/trunnel.md
+++ b/doc/trunnel.md
@@ -416,7 +416,7 @@ You can also use this notation to indicate the extent of a 
union:
 
 ### Parameterizing structures
 
-Some protocols have the type of length of some structure fields depend
+Some protocols have the type or length of some structure fields depend
 on settings elsewhere in the protocol.  For example, you might have a
 TLS-like protocol where each encrypted records's format depends on
 some session parameters.
@@ -570,7 +570,7 @@ on success and `-1` on failure.  Additionally on failure, 
they set an error
 code on the object that prevents the object from being encoded unless the
 error code is cleared.
 
-**Integers** and **nul-terminated strings** have a` get` and `set` function:
+**Integers** and **nul-terminated strings** have a `get` and `set` function:
 
  struct example {
 u8 a;
@@ -748,7 +748,7 @@ Finally, if you want to ensure that all objects freed by 
trunnel are
 wiped from memory before they're freed, you can define a
 `trunnel_memwipe` function.  For example:
 
-#define trunnel_memipe(mem, len)  memset_s((mem), 0, (len));
+#define trunnel_memwipe(mem, len)  memset_s((mem), 0, (len));
 
 Note that the standard caveats about wiping memory apply: if this
 matters to you, you should know why you should be using memset_s or

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

[tor-commits] [tor/master] Remove already-merged changes files.

2016-07-07 Thread nickm

commit 9a0bc46225bf9ddea67da5c9e400899e24ddbdd0
Author: Nick Mathewson 
Date:   Thu Jul 7 13:16:44 2016 -0400

Remove already-merged changes files.

These changes files already are merged in release-0.2.8, and
therefor will not be "new in 0.2.9.1-alpha".
---
 changes/19271 |  2 --
 changes/asciidoc-UTC  |  4 
 changes/bug17150  |  7 ---
 changes/bug18668  |  3 ---
 changes/bug18809  | 16 
 changes/bug18812  |  4 
 changes/bug18849  |  4 
 changes/bug19161  |  3 ---
 changes/bug19191  |  5 -
 changes/bug19203  |  4 
 changes/bug19213  |  3 ---
 changes/bug19406  |  4 
 changes/bug19454  |  3 ---
 changes/bug19464  |  6 --
 changes/bug19499  |  4 
 changes/bug19556  |  7 ---
 changes/bug19557  |  4 
 changes/bug19608  |  6 --
 changes/geoip-jun2016 |  4 
 changes/memarea_overflow  |  7 ---
 changes/rsa_init_bug  |  7 ---
 changes/ticket19071-19480 | 13 -
 22 files changed, 120 deletions(-)

diff --git a/changes/19271 b/changes/19271
deleted file mode 100644
index dc06ead..000
--- a/changes/19271
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Directory authority changes:
-- Urras is no longer a directory authority. Closes ticket 19271.
diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC
deleted file mode 100644
index 21fbfc1..000
--- a/changes/asciidoc-UTC
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (build):
-- When building manual pages, set the timezone to "UTC", so that the
-  output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha.
-  Patch from intrigeri.
diff --git a/changes/bug17150 b/changes/bug17150
deleted file mode 100644
index 686cc34..000
--- a/changes/bug17150
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (directory warnings):
-- When fetching extrainfo documents, compare their SHA256 digests
-  and Ed25519 signing key certificates
-  with the routerinfo that led us to fetch them, rather than
-  with the most recent routerinfo. Otherwise we generate many
-  spurious warnings about mismatches. Fixes bug 17150; bugfix
-  on 0.2.7.2-alpha.
diff --git a/changes/bug18668 b/changes/bug18668
deleted file mode 100644
index 4b186b5..000
--- a/changes/bug18668
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (tests):
-- Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668;
-  bugfix on 0.2.8.1-alpha.
diff --git a/changes/bug18809 b/changes/bug18809
deleted file mode 100644
index 1e15187..000
--- a/changes/bug18809
+++ /dev/null
@@ -1,16 +0,0 @@
-  o Major bugfixes (bootstrap):
-- Check if bootstrap consensus downloads are still needed
-  when the linked connection attaches. This prevents tor
-  making unnecessary begindir-style connections, which are
-  the only directory connections tor clients make since
-  the fix for 18483 was merged.
-- Fix some edge cases where consensus download connections
-  may not have been closed, even though they were not needed.
-  Related to fix  18809.
-- Make relays retry consensus downloads the correct number of
-  times, rather than the more aggressive client retry count.
-  Fixes part of ticket 18809.
-- Stop downloading consensuses when we have a consensus,
-  even if we don't have all the certificates for it yet.
-  Fixes bug 18809; bugfix on 0.2.8.1-alpha.
-  Patches by arma and teor.
diff --git a/changes/bug18812 b/changes/bug18812
deleted file mode 100644
index 793e110..000
--- a/changes/bug18812
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (bootstrap):
-- When a fallback changes its fingerprint from the hard-coded
-  fingerprint, log a less severe, more explanatory log message.
-  Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor.
diff --git a/changes/bug18849 b/changes/bug18849
deleted file mode 100644
index b12a8da..000
--- a/changes/bug18849
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfix (logging):
-- Reduce excessive logging when directories can't be found.
-  Fixes bug 18849; bugfix on 0.2.8.3-alpha and 0.2.8.1-alpha.
-  Patch by teor.
diff --git a/changes/bug19161 b/changes/bug19161
deleted file mode 100644
index 78c2165..000
--- a/changes/bug19161
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-- When libscrypt.h is found, but no libscrypt library can be linked,
-  treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha.
diff --git a/changes/bug19191 b/changes/bug19191
deleted file mode 100644
index 8670aaa..000
--- a/changes/bug19191
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (downloading):
-- Predict more correctly whether we'll be downloading over HTTP when we
-  determine the maximum length of a URL. This should avoid a

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

2016-07-07 Thread translation

commit ef9fc17cb430373d753ccfc5efaabe4c5a92692c
Author: Translation commit bot 
Date:   Thu Jul 7 17:15:28 2016 +

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

diff --git a/sk_SK/https-everywhere.dtd b/sk_SK/https-everywhere.dtd
index 249824e..5263373 100644
--- a/sk_SK/https-everywhere.dtd
+++ b/sk_SK/https-everywhere.dtd
@@ -3,26 +3,26 @@
 
 
 
-
+
 
-
+
 
-
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 

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

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

2016-07-07 Thread nickm

commit 5a64f42f91bf4371903cecc34fe8118fae0a4aad
Merge: a5b953a a931d15
Author: Nick Mathewson 
Date:   Thu Jul 7 12:43:59 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/release-0.2.8] Fold new 028 entries into draft ReleaseNotes. (Excluding regression fixes on 028)

2016-07-07 Thread nickm

commit 35a5a1b6330f170f1838e6dbc77a9c035ef0ad33
Author: Nick Mathewson 
Date:   Thu Jul 7 12:47:38 2016 -0400

Fold new 028 entries into draft ReleaseNotes. (Excluding regression fixes 
on 028)
---
 ReleaseNotes | 22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index b117620..3dbf33c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,8 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+
+
 Changes in version 0.2.8.??? - 2015-0?-??
   o New system requirements:
 - Tor no longer attempts to support platforms where the "time_t"
@@ -18,6 +20,12 @@ Changes in version 0.2.8.??? - 2015-0?-??
   distribution, and your tools are older than this, you will need to
   upgrade. Closes ticket 17732.
 
+  o Directory authority changes:
+- Update the V3 identity key for the dannenberg directory authority:
+  it was changed on 18 November 2015. Closes task 17906. Patch
+  by "teor".
+- Urras is no longer a directory authority. Closes ticket 19271.
+
   o Major features (directory system):
 - Include a trial list of default fallback directories, based on an
   opt-in survey of suitable relays. Doing this should make clients
@@ -121,11 +129,6 @@ Changes in version 0.2.8.??? - 2015-0?-??
   keeping its Ed25519 identity. Fixes bug 17668; fixes part of bug
   18318. Bugfix on 0.2.7.2-alpha.
 
-  o Major key updates:
-- Update the V3 identity key for the dannenberg directory authority:
-  it was changed on 18 November 2015. Closes task 17906. Patch
-  by "teor".
-
   o Minor features (accounting):
 - Added two modes to the AccountingRule option: One for limiting
   only the number of bytes sent ("AccountingRule out"), and one for
@@ -149,6 +152,12 @@ Changes in version 0.2.8.??? - 2015-0?-??
 - Tor now builds successfully with the recent OpenSSL 1.1
   development branch, and with the latest LibreSSL. Closes tickets
   17549, 17921, and 17984.
+- Tor now again builds with the recent OpenSSL 1.1 development
+  branch (tested against 1.1.0-pre6-dev). Closes ticket 19499.
+- When building manual pages, set the timezone to "UTC", so that the
+  output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha.
+  Patch from intrigeri.
+
 
   o Minor features (clients):
 - Make clients, onion services, and bridge relays always use an
@@ -519,6 +528,9 @@ Changes in version 0.2.8.??? - 2015-0?-??
   start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha.
 - Fix a crash when using offline master ed25519 keys with the Linux
   seccomp2 sandbox enabled. Fixes bug 17675; bugfix on 0.2.7.3-rc.
+- Allow statistics to be written to disk when "Sandbox 1" is
+  enabled. Fixes bugs 19556 and 19957; bugfix on 0.2.5.1-alpha and
+  0.2.6.1-alpha respectively.
 
   o Minor bugfixes (logging):
 - In log messages that include a function name, use __FUNCTION__

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

[tor-commits] [tor/release-0.2.8] Bump maint-0.2.8 to 0.2.8.5-rc-dev

2016-07-07 Thread nickm

commit a931d157fd5454f679614e0a210144552ecabadf
Author: Nick Mathewson 
Date:   Thu Jul 7 12:43:52 2016 -0400

Bump maint-0.2.8 to 0.2.8.5-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 984565a..fa82624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.5-rc])
+AC_INIT([tor],[0.2.8.5-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fc2c6db..1f5bd3e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.5-rc"
+!define VERSION "0.2.8.5-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7890819..8e37892 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.5-rc"
+#define VERSION "0.2.8.5-rc-dev"
 
 
 



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

[tor-commits] [tor/master] Bump maint-0.2.8 to 0.2.8.5-rc-dev

2016-07-07 Thread nickm

commit a931d157fd5454f679614e0a210144552ecabadf
Author: Nick Mathewson 
Date:   Thu Jul 7 12:43:52 2016 -0400

Bump maint-0.2.8 to 0.2.8.5-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 984565a..fa82624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.5-rc])
+AC_INIT([tor],[0.2.8.5-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fc2c6db..1f5bd3e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.5-rc"
+!define VERSION "0.2.8.5-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7890819..8e37892 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.5-rc"
+#define VERSION "0.2.8.5-rc-dev"
 
 
 



___
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.8] Bump maint-0.2.8 to 0.2.8.5-rc-dev

2016-07-07 Thread nickm

commit a931d157fd5454f679614e0a210144552ecabadf
Author: Nick Mathewson 
Date:   Thu Jul 7 12:43:52 2016 -0400

Bump maint-0.2.8 to 0.2.8.5-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 984565a..fa82624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.5-rc])
+AC_INIT([tor],[0.2.8.5-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fc2c6db..1f5bd3e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.5-rc"
+!define VERSION "0.2.8.5-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7890819..8e37892 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.5-rc"
+#define VERSION "0.2.8.5-rc-dev"
 
 
 

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

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

2016-07-07 Thread nickm

commit 663b659434267f1c8edb1a130f10d6f3a91da831
Merge: bfd5000 a931d15
Author: Nick Mathewson 
Date:   Thu Jul 7 12:44:07 2016 -0400

Merge branch 'maint-0.2.8'

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

[tor-commits] [tor/master] Forward-port the 0.2.8.5-rc changelog

2016-07-07 Thread nickm

commit bfd50001cb1c51a82053419b35ca341527fb92b8
Author: Nick Mathewson 
Date:   Thu Jul 7 12:42:27 2016 -0400

Forward-port the 0.2.8.5-rc changelog
---
 ChangeLog | 63 +++
 1 file changed, 63 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9b10b3e..6d066cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,69 @@
 Changes in version 0.2.9.1-alpha - 2016-??-??
 
 
+Changes in version 0.2.8.5-rc - 2016-07-07
+  Tor 0.2.8.5-rc is the second release candidate in the Tor 0.2.8
+  series. If we find no new bugs or regressions here, the first stable
+  0.2.8 release will be identical to it. It has a few small bugfixes
+  against previous versions.
+
+  o Directory authority changes:
+- Urras is no longer a directory authority. Closes ticket 19271.
+
+  o Major bugfixes (heartbeat):
+- Fix a regression that would crash Tor when the periodic
+  "heartbeat" log messages were disabled. Fixes bug 19454; bugfix on
+  tor-0.2.8.1-alpha. Reported by "kubaku".
+
+  o Minor features (build):
+- Tor now again builds with the recent OpenSSL 1.1 development
+  branch (tested against 1.1.0-pre6-dev). Closes ticket 19499.
+- When building manual pages, set the timezone to "UTC", so that the
+  output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha.
+  Patch from intrigeri.
+
+  o Minor bugfixes (fallback directory selection):
+- Avoid errors during fallback selection if there are no eligible
+  fallbacks. Fixes bug 19480; bugfix on 0.2.8.3-alpha. Patch
+  by teor.
+
+  o Minor bugfixes (IPv6, microdescriptors):
+- Don't check node addresses when we only have a routerstatus. This
+  allows IPv6-only clients to bootstrap by fetching microdescriptors
+  from fallback directory mirrors. (The microdescriptor consensus
+  has no IPv6 addresses in it.) Fixes bug 19608; bugfix
+  on 0.2.8.2-alpha.
+
+  o Minor bugfixes (logging):
+- Reduce pointlessly verbose log messages when directory servers
+  can't be found. Fixes bug 18849; bugfix on 0.2.8.3-alpha and
+  0.2.8.1-alpha. Patch by teor.
+- When a fallback directory changes its fingerprint from the hard-
+  coded fingerprint, log a less severe, more explanatory log
+  message. Fixes bug 18812; bugfix on 0.2.8.1-alpha. Patch by teor.
+
+  o Minor bugfixes (Linux seccomp2 sandboxing):
+- Allow statistics to be written to disk when "Sandbox 1" is
+  enabled. Fixes bugs 19556 and 19957; bugfix on 0.2.5.1-alpha and
+  0.2.6.1-alpha respectively.
+
+  o Minor bugfixes (user interface):
+- Remove a warning message "Service [scrubbed] not found after
+  descriptor upload". This message appears when one uses HSPOST
+  control command to upload a service descriptor. Since there is
+  only a descriptor and no service, showing this message is
+  pointless and confusing. Fixes bug 19464; bugfix on 0.2.7.2-alpha.
+
+  o Fallback directory list:
+- Add a comment to the generated fallback directory list that
+  explains how to comment out unsuitable fallbacks in a way that's
+  compatible with the stem fallback parser.
+- Update fallback whitelist and blacklist based on relay operator
+  emails. Blacklist unsuitable (non-working, over-volatile)
+  fallbacks. Resolves ticket 19071. Patch by teor.
+- Update hard-coded fallback list to remove unsuitable fallbacks.
+  Resolves ticket 19071. Patch by teor.
+
 
 Changes in version 0.2.8.4-rc - 2016-06-15
   Tor 0.2.8.4-rc is the first release candidate in the Tor 0.2.8 series.

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

[tor-commits] [webwml/master] New release candidate (source).

2016-07-07 Thread nickm

commit 16bb4da7cf14a5780917af53706dce97c9ac76aa
Author: Nick Mathewson 
Date:   Thu Jul 7 12:40:46 2016 -0400

New release candidate (source).
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9e24d60..f266493 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.7.6
-export DEVTAG=tor-0.2.8.4-rc
+export DEVTAG=tor-0.2.8.5-rc
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index c1cae5d..a044ba3 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.2.7.6
-0.2.8.4-rc
+0.2.8.5-rc
 
 0.2.7.6
 

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

[tor-commits] [tor/release-0.2.8] Pick a release date. I think I can do it today.

2016-07-07 Thread nickm

commit a5b953ae2108803833cfd37e25d7a786bfa4538d
Author: Nick Mathewson 
Date:   Thu Jul 7 11:38:00 2016 -0400

Pick a release date. I think I can do it today.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1cea4eb..b92830e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.8.5-rc - 2016-07-0?
+Changes in version 0.2.8.5-rc - 2016-07-07
   Tor 0.2.8.5-rc is the second release candidate in the Tor 0.2.8
   series. If we find no new bugs or regressions here, the first stable
   0.2.8 release will be identical to it. It has a few small bugfixes

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

[tor-commits] [webwml/master] Alphabet is confusing and line breaks are important

2016-07-07 Thread sebastian

commit 9beb27b1b75f8db5b7b9a917a4815e3919b60b93
Author: Sebastian Hahn 
Date:   Thu Jul 7 17:39:51 2016 +0200

Alphabet is confusing and line breaks are important
---
 about/en/contributors.wml | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index c912596..563d3de 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -18,17 +18,19 @@
 Alexandre Allaire, Developer
 Helped develop and package Flash Proxy.
 
-Carolyn AnhaltCoordinated translations and translators for
-all of tor's content; website, products, and materials.
-Thomas S. Benjamin
-Anonymous communications and bridge distribution
-researcher. His other work can be found on his http://cryptocracy.net/;>personal website.
+Carolyn Anhalt
+Coordinated translations and translators for all of tor's content;
+website, products, and materials.
 
 Jacob Appelbaum, Advocate, Developer
 Represented Tor at conferences and trainings, and developed tools
 for the Tor ecosystem. Ran one of the Tor directory authorities.
 
+Thomas S. Benjamin
+Anonymous communications and bridge distribution
+researcher. His other work can be found on his http://cryptocracy.net/;>personal website.
+
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise
 management, travel, and other projects.

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

[tor-commits] [webwml/master] Used to run -> Ran

2016-07-07 Thread sebastian

commit 452d1290e5aeff12c6e19876f8f6fa6cd2d4f724
Author: Sebastian Hahn 
Date:   Thu Jul 7 16:49:04 2016 +0200

Used to run -> Ran
---
 about/en/contributors.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index e90052d..c912596 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -27,8 +27,7 @@ href="http://cryptocracy.net/;>personal website.
 
 Jacob Appelbaum, Advocate, Developer
 Represented Tor at conferences and trainings, and developed tools
-for the Tor ecosystem. Used to run one of the Tor directory
-authorities.
+for the Tor ecosystem. Ran one of the Tor directory authorities.
 
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise

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

[tor-commits] [torspec/master] Add the twstrike guard selection draft as a separate proposal

2016-07-07 Thread nickm

commit f6f897c365044bcb293726b4579358826ceb038c
Author: Nick Mathewson 
Date:   Thu Jul 7 10:08:45 2016 -0400

Add the twstrike guard selection draft as a separate proposal

Taken from

https://raw.githubusercontent.com/twstrike/torspec/review/proposals/259-guard-selection.txt

See editorial note for comment on why I'm not just dropping this in
over prop259.
---
 proposals/000-index.txt   |   2 +
 proposals/268-guard-selection.txt | 507 ++
 2 files changed, 509 insertions(+)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 23fc3dc..180ba4e 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -188,6 +188,7 @@ Proposals by number:
 265  Load Balancing with Overhead Parameters [ACCEPTED]
 266  Removing current obsolete clients from the Tor network [DRAFT]
 267  Tor Consensus Transparency [DRAFT]
+268  New Guard Selection Behaviour [DRAFT]
 
 
 Proposals by status:
@@ -213,6 +214,7 @@ Proposals by status:
260  Rendezvous Single Onion Services
266  Removing current obsolete clients from the Tor network
267  Tor Consensus Transparency
+   268  New Guard Selection Behaviour
  NEEDS-REVISION:
190  Bridge Client Authorization Based on a Shared Secret
  NEEDS-RESEARCH:
diff --git a/proposals/268-guard-selection.txt 
b/proposals/268-guard-selection.txt
new file mode 100644
index 000..9277dd8
--- /dev/null
+++ b/proposals/268-guard-selection.txt
@@ -0,0 +1,507 @@
+Filename: 268-guard-selection.txt
+Title: New Guard Selection Behaviour
+Author: Isis Lovecruft, George Kadianakis, [Ola Bini]
+Created: 2015-10-28
+Status: Draft
+
+  (Editorial note: this was origianlly written as a revision of
+  proposal 259, but it diverges so substantially that it seemed
+  better to assign it a new number for reference, so that we
+  aren't always talking about "The old 259" and "the new 259". -NM)
+
+Â§1. Overview
+
+  Tor uses entry guards to prevent an attacker who controls some
+  fraction of the network from observing a fraction of every user's
+  traffic. If users chose their entries and exits uniformly at
+  random from the list of servers every time they build a circuit,
+  then an adversary who had (k/N) of the network would deanonymize
+  F=(k/N)^2 of all circuits... and after a given user had built C
+  circuits, the attacker would see them at least once with
+  probability 1-(1-F)^C.  With large C, the attacker would get a
+  sample of every user's traffic with probability 1.
+
+  To prevent this from happening, Tor clients choose a small number of
+  guard nodes (currently 3).  These guard nodes are the only nodes
+  that the client will connect to directly.  If they are not
+  compromised, the user's paths are not compromised.
+
+  But attacks remain.  Consider an attacker who can run a firewall
+  between a target user and the Tor network, and make
+  many of the guards they don't control appear to be unreachable.
+  Or consider an attacker who can identify a user's guards, and mount
+  denial-of-service attacks on them until the user picks a guard
+  that the attacker controls.
+
+  In the presence of these attacks, we can't continue to connect to
+  the Tor network unconditionally.  Doing so would eventually result
+  in the user choosing a hostile node as their guard, and losing
+  anonymity.
+
+  This proposal outlines a new entry guard selection algorithm, which
+  addresses the following concerns:
+
+- Heuristics and algorithms for determining how and which guard(s)
+  is(/are) chosen should be kept as simple and easy to understand
+  as possible.
+
+- Clients in censored regions or who are behind a fascist firewall
+  who connect to the Tor network should not experience any
+  significant disadvantage in terms of reachability or usability.
+
+- Tor should make a best attempt at discovering the most
+  appropriate behaviour, with as little user input and
+  configuration as possible.
+
+
+Â§2. Design
+
+  Alice, an OP attempting to connect to the Tor network, should
+  undertake the following steps to determine information about the
+  local network and to select (some) appropriate entry guards.  In the
+  following scenario, it is assumed that Alice has already obtained a
+  recent, valid, and verifiable consensus document.
+
+  The algorithm is divided into four components such that the full
+  algorithm is implemented by first invoking START, then repeatedly
+  calling NEXT while adviced it SHOULD_CONTINUE and finally calling
+  END. For an example usage see Â§A. Appendix.
+
+  Several components of NEXT can be invoked asynchronously. SHOULD_CONTINUE
+  is used for the algorithm to be able to tell the caller whether we
+  consider the work done or not - this can be used to retry primary
+  guards when we finally are able to connect to a guard after a long
+  network outage, for example.
+
+  This algorithm keeps track of the

[tor-commits] [onionoo/master] Avoid using the deprecated ExitListEntry type.

2016-07-07 Thread karsten

commit e4effb03de01790f46b693d04dbe8b55fb2523e0
Author: Karsten Loesing 
Date:   Wed Jul 6 16:41:59 2016 +0200

Avoid using the deprecated ExitListEntry type.
---
 .../onionoo/updater/NodeDetailsStatusUpdater.java  | 35 --
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index 531b20e..9bceaa1 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -6,7 +6,6 @@ package org.torproject.onionoo.updater;
 import org.torproject.descriptor.BridgeNetworkStatus;
 import org.torproject.descriptor.Descriptor;
 import org.torproject.descriptor.ExitList;
-import org.torproject.descriptor.ExitListEntry;
 import org.torproject.descriptor.ExtraInfoDescriptor;
 import org.torproject.descriptor.NetworkStatusEntry;
 import org.torproject.descriptor.RelayNetworkStatusConsensus;
@@ -209,22 +208,26 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   new HashMap>();
 
   private void processExitList(ExitList exitList) {
-for (ExitListEntry exitListEntry : exitList.getExitListEntries()) {
+for (ExitList.Entry exitListEntry : exitList.getEntries()) {
   String fingerprint = exitListEntry.getFingerprint();
-  long scanMillis = exitListEntry.getScanMillis();
-  if (scanMillis < this.now - DateTimeHelper.ONE_DAY) {
-continue;
-  }
-  if (!this.exitListEntries.containsKey(fingerprint)) {
-this.exitListEntries.put(fingerprint,
-new HashMap());
-  }
-  String exitAddress = exitListEntry.getExitAddress();
-  if (!this.exitListEntries.get(fingerprint).containsKey(exitAddress)
-  || this.exitListEntries.get(fingerprint).get(exitAddress)
-  < scanMillis) {
-this.exitListEntries.get(fingerprint).put(exitAddress,
-scanMillis);
+  for (Map.Entry exitAddressScanMillis
+  : exitListEntry.getExitAddresses().entrySet()) {
+long scanMillis = exitAddressScanMillis.getValue();
+if (scanMillis < this.now - DateTimeHelper.ONE_DAY) {
+  continue;
+}
+if (!this.exitListEntries.containsKey(fingerprint)) {
+  this.exitListEntries.put(fingerprint,
+  new HashMap());
+}
+String exitAddress = exitAddressScanMillis.getKey();
+if (!this.exitListEntries.get(fingerprint).containsKey(
+exitAddress)
+|| this.exitListEntries.get(fingerprint).get(exitAddress)
+< scanMillis) {
+  this.exitListEntries.get(fingerprint).put(exitAddress,
+  scanMillis);
+}
   }
 }
   }

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

[tor-commits] [onionoo/master] Add checkstyle task.

2016-07-07 Thread karsten

commit ce4be425c23185d4dcd7c0de11154baff85a9f3b
Author: Karsten Loesing 
Date:   Wed Jul 6 11:45:25 2016 +0200

Add checkstyle task.

Copied over from CollecTor.
---
 build.xml |  25 
 src/test/resources/metrics_checks.xml | 217 ++
 2 files changed, 242 insertions(+)

diff --git a/build.xml b/build.xml
index 49376be..1688207 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,9 @@
   
   
   
+  
   
+  
   
   
   
@@ -73,11 +75,18 @@
 
   
 
+  
+
+  
+
+  
+
   
 
 
 
 
+
   
 
   
@@ -124,6 +133,22 @@
 
   
 
+  
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+  
+
   
 
+http://www.puppycrawl.com/dtds/configuration_1_3.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ftp://"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



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

[tor-commits] [exonerator/master] Add checkstyle task.

2016-07-07 Thread karsten

commit 43ea75698740196a3898d6b54b393f3e2c08ed36
Author: Karsten Loesing 
Date:   Wed Jul 6 11:01:45 2016 +0200

Add checkstyle task.

Copied over from CollecTor.
---
 build.xml |  24 
 src/test/resources/metrics_checks.xml | 217 ++
 2 files changed, 241 insertions(+)

diff --git a/build.xml b/build.xml
index 2e4f74d..7a52b17 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,9 @@
   
   
   
+  
   
+  
   
   
   
@@ -21,11 +23,17 @@
   
 
   
+  
+
+  
+
+  
 
   
 
 
 
+
   
 
   
@@ -52,6 +60,22 @@
 
   
 
+  
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+  
+
   
   
diff --git a/src/test/resources/metrics_checks.xml 
b/src/test/resources/metrics_checks.xml
new file mode 100644
index 000..0777894
--- /dev/null
+++ b/src/test/resources/metrics_checks.xml
@@ -0,0 +1,217 @@
+
+http://www.puppycrawl.com/dtds/configuration_1_3.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ftp://"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



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

[tor-commits] [exonerator/master] Fix most of the style issues found by checkstyle.

2016-07-07 Thread karsten

commit 61171791dddc0245355bcc12b204a2c42674d295
Author: Karsten Loesing 
Date:   Wed Jul 6 11:18:01 2016 +0200

Fix most of the style issues found by checkstyle.
---
 .../exonerator/ExoneraTorDatabaseImporter.java | 78 ++
 .../torproject/exonerator/ExoneraTorServlet.java   | 92 +++---
 2 files changed, 90 insertions(+), 80 deletions(-)

diff --git 
a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java 
b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java
index 41751ca..23c009b 100644
--- a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java
+++ b/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java
@@ -1,7 +1,14 @@
-/* Copyright 2011, 2012 The Tor Project
+/* Copyright 2011--2016 The Tor Project
  * See LICENSE for licensing information */
+
 package org.torproject.exonerator;
 
+import org.torproject.descriptor.DescriptorCollector;
+import org.torproject.descriptor.DescriptorSourceFactory;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -12,7 +19,6 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -29,12 +35,6 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.TimeZone;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.torproject.descriptor.DescriptorCollector;
-import org.torproject.descriptor.DescriptorSourceFactory;
-
 /* Import Tor descriptors into the ExoneraTor database. */
 public class ExoneraTorDatabaseImporter {
 
@@ -101,6 +101,7 @@ public class ExoneraTorDatabaseImporter {
 
   /* Callable statements to import data into the database. */
   private static CallableStatement insertStatusentryStatement;
+
   private static CallableStatement insertExitlistentryStatement;
 
   /* Prepare statements for importing data into the database. */
@@ -159,7 +160,9 @@ public class ExoneraTorDatabaseImporter {
   /* Last and next parse histories containing paths of parsed files and
* last modified times. */
   private static Map
-  lastImportHistory = new HashMap(),
+  lastImportHistory = new HashMap();
+
+  private static Map
   nextImportHistory = new HashMap();
 
   /* Read stats/exonerator-import-history file from disk and remember
@@ -224,8 +227,8 @@ public class ExoneraTorDatabaseImporter {
 long lastModified = file.lastModified();
 String filename = file.getName();
 nextImportHistory.put(filename, lastModified);
-if (!lastImportHistory.containsKey(filename) ||
-lastImportHistory.get(filename) < lastModified) {
+if (!lastImportHistory.containsKey(filename)
+|| lastImportHistory.get(filename) < lastModified) {
   try {
 FileInputStream fis = new FileInputStream(file);
 BufferedInputStream bis = new BufferedInputStream(fis);
@@ -264,8 +267,8 @@ public class ExoneraTorDatabaseImporter {
   String startToken = null;
   if (line.equals("network-status-version 3")) {
 startToken = "network-status-version 3";
-  } else if (line.startsWith("Downloaded ") ||
-  line.startsWith("ExitNode ")) {
+  } else if (line.startsWith("Downloaded ")
+  || line.startsWith("ExitNode ")) {
 startToken = "ExitNode ";
   } else {
 System.out.println("Unknown descriptor type in file '" + file
@@ -273,7 +276,8 @@ public class ExoneraTorDatabaseImporter {
 return;
   }
   String splitToken = "\n" + startToken;
-  int length = bytes.length, start = asciiString.indexOf(startToken);
+  int length = bytes.length;
+  int start = asciiString.indexOf(startToken);
   while (start < length) {
 int end = asciiString.indexOf(splitToken, start);
 if (end < 0) {
@@ -298,6 +302,7 @@ public class ExoneraTorDatabaseImporter {
 
   /* Date format to parse UTC timestamps. */
   private static SimpleDateFormat parseFormat;
+
   static {
 parseFormat = new SimpleDateFormat("-MM-dd HH:mm:ss");
 parseFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -308,32 +313,35 @@ public class ExoneraTorDatabaseImporter {
 try {
   BufferedReader br = new BufferedReader(new StringReader(new String(
   bytes, "US-ASCII")));
-  String line, fingerprint = null, descriptor = null;
+  String line;
+  String fingerprint = null;
+  String descriptor = null;
   Set orAddresses = new HashSet();
   long validAfterMillis = -1L;
   StringBuilder

[tor-commits] [webwml/master] tup isn't our only pseudonym anymore

2016-07-07 Thread sebastian

commit 34d753af205e14f542fd0c4ee354041812b72b8a
Author: Sebastian Hahn 
Date:   Thu Jul 7 12:43:17 2016 +0200

tup isn't our only pseudonym anymore
---
 about/en/contributors.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 31be450..e90052d 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -170,8 +170,8 @@ href="">Torbutton.
 Worked on the artwork and design for various projects,
 annual reports, and brochures.
 
-tup (a pseudonym)Added new features for
-making Tor easier to use as a tup
+Added new features for making Tor easier to use as a transparent
 proxy. Also wrote the http://p56soo2ibjkx23xo.onion/;>TorDNSEL code.

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

[tor-commits] [webwml/master] Add Jake to past contributors page

2016-07-07 Thread sebastian

commit 01f582bdb08f2b77cd845aaa0c4f152e25c2aece
Author: Sebastian Hahn 
Date:   Thu Jul 7 12:29:34 2016 +0200

Add Jake to past contributors page
---
 about/en/contributors.wml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index dadb568..31be450 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -25,6 +25,11 @@ all of tor's content; website, products, and materials.
 researcher. His other work can be found on his http://cryptocracy.net/;>personal website.
 
+Jacob Appelbaum, Advocate, Developer
+Represented Tor at conferences and trainings, and developed tools
+for the Tor ecosystem. Used to run one of the Tor directory
+authorities.
+
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise
 management, travel, and other projects.

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

[tor-commits] [metrics-lib/master] All clean according to checkstyle.

2016-07-07 Thread karsten

commit ac5ff698c9585d4f5414e40cd6dd978692e8409a
Author: iwakeh 
Date:   Thu Jul 7 10:02:29 2016 +0200

All clean according to checkstyle.
---
 .gitignore   | 1 +
 .../java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java | 2 ++
 .../java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java | 3 +++
 src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java  | 5 +
 4 files changed, 11 insertions(+)

diff --git a/.gitignore b/.gitignore
index bb59c26..f2c33a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 classes/
+cobertura.ser
 generated/
 lib/
 descriptor-*.jar
diff --git 
a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java 
b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java
index 6a56d44..8e456db 100644
--- a/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/BridgeNetworkStatusImpl.java
@@ -144,6 +144,8 @@ public class BridgeNetworkStatusImpl extends 
NetworkStatusImpl
   case "ignoring-advertised-bws":
 this.ignoringAdvertisedBws = Integer.parseInt(e.getValue());
 break;
+  default:
+/* nothing to be done */
 }
   }
 } catch (NumberFormatException ex) {
diff --git 
a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java 
b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java
index 331e7d9..23826aa 100644
--- a/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java
@@ -267,6 +267,9 @@ public class DownloadCoordinatorImpl implements 
DownloadCoordinator {
 if (response.getResponseCode() != 200) {
   this.missingVotes.add(requestedVote);
 }
+break;
+  default:
+/* nothing to be done */
 }
 if (response.getRequestEnd() != 0L) {
   this.descriptorQueue.add(response);
diff --git 
a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java 
b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java
index b6c274d..061a171 100644
--- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java
+++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java
@@ -261,6 +261,11 @@ public abstract class NetworkStatusImpl extends 
DescriptorImpl {
 : new ArrayList<>(this.signatures);
   }
 
+  /**
+   * Implements method defined in
+   * {@link org.torproject.descriptor.RelayNetworkStatusConsensus}
+   * and {@link org.torproject.descriptor.RelayNetworkStatusVote}.
+   */
   public SortedMap getDirectorySignatures() {
 SortedMap directorySignatures = null;
 if (this.signatures != null) {

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

[tor-commits] [collector/master] Implement #19373 and add one word to comment in build.xml.

2016-07-07 Thread karsten

commit 0d9a197f1c512f318b225d07d8e764212954e10f
Author: iwakeh 
Date:   Wed Jul 6 20:22:13 2016 +0200

Implement #19373 and add one word to comment in build.xml.
---
 build.xml  |  2 +-
 .../java/org/torproject/collector/MainTest.java| 24 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index ffb1fca..099eb8b 100644
--- a/build.xml
+++ b/build.xml
@@ -224,7 +224,7 @@
   
   
 
-  
+  
   
   
   
diff --git a/src/test/java/org/torproject/collector/MainTest.java 
b/src/test/java/org/torproject/collector/MainTest.java
index f83cab5..55b0569 100644
--- a/src/test/java/org/torproject/collector/MainTest.java
+++ b/src/test/java/org/torproject/collector/MainTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 
 import org.torproject.collector.conf.Key;
 import org.torproject.collector.conf.ConfigurationException;
@@ -23,6 +24,7 @@ import java.security.AccessControlException;
 import java.security.Policy;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 import java.util.Random;
 
 import org.junit.rules.TemporaryFolder;
@@ -69,4 +71,26 @@ public class MainTest {
 bw.close();
   }
 
+  /* Verifies the contents of the default collector.properties file.
+   * All properties specified have to be present but nothing else. */
+  @Test()
+  public void testPropertiesFile() throws Exception {
+Properties props = new Properties();
+props.load(getClass().getClassLoader().getResourceAsStream(
+Main.CONF_FILE));
+for (Key key : Key.values()) {
+  assertNotNull("Property '" + key.name() + "' not specified in "
+  + Main.CONF_FILE + ".",
+  props.getProperty(key.name()));
+}
+for (String propName : props.stringPropertyNames()) {
+  try {
+Key.valueOf(propName);
+  } catch (IllegalArgumentException ex) {
+fail("Invalid property name '" + propName + "' found in "
++ Main.CONF_FILE + ".");
+  }
+}
+  }
 }
+

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

38 matches

Mail list logo