date:20140722

[tor-commits] r26881: {website} remove vidalia from the active projects page (website/trunk/projects/en)

2014-07-22 Thread Roger Dingledine

Author: arma
Date: 2014-07-22 06:35:49 + (Tue, 22 Jul 2014)
New Revision: 26881

Modified:
   website/trunk/projects/en/projects.wml
Log:
remove vidalia from the active projects page


Modified: website/trunk/projects/en/projects.wml
===
--- website/trunk/projects/en/projects.wml  2014-07-21 16:34:52 UTC (rev 
26880)
+++ website/trunk/projects/en/projects.wml  2014-07-22 06:35:49 UTC (rev 
26881)
@@ -152,17 +152,6 @@
 /p
 /div
 /div
- 
-div class=projectbox
-a href=page projects/vidaliaimg class=icon
-src=$(IMGROOT)/icon-Vidalia.jpg alt=Vidalia Icon width=75
-height=75/a
-div class=projectdescdiv class=namea
-href=page projects/vidaliaVidalia/a/div
-pVidalia is a graphical Tor controller. It allows you to
-see where your connections are in the world and configure
-Tor without getting into configuration files and code./p
-/div/div
 
 /table
 !-- END TABLE --

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

[tor-commits] [metrics-lib/master] Allow underscore in transport names.

2014-07-22 Thread karsten

commit 7b026cf44ac775a990e42762c1151f973832ca8a
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jul 22 09:21:00 2014 +0200

Allow underscore in transport names.

Example of a valid line that is now allowed:

bridge-ip-transports meek=32,obfs3_websocket=8,websocket=64
---
 src/org/torproject/descriptor/impl/ParseHelper.java|2 +-
 .../descriptor/impl/ExtraInfoDescriptorImplTest.java   |8 
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java 
b/src/org/torproject/descriptor/impl/ParseHelper.java
index 048225c..caec1bb 100644
--- a/src/org/torproject/descriptor/impl/ParseHelper.java
+++ b/src/org/torproject/descriptor/impl/ParseHelper.java
@@ -302,7 +302,7 @@ public class ParseHelper {
   + index  + index + .);
 } else if (partsNoOpt.length  index) {
   if (!commaSeparatedKeyValueListPatterns.containsKey(keyLength)) {
-String keyPattern = [0-9a-zA-Z?-]
+String keyPattern = [0-9a-zA-Z?\\-_]
 + (keyLength == 0 ? + : { + keyLength + });
 String valuePattern = \\-?[0-9]{1,9};
 String patternString = String.format(^%s=%s(,%s=%s)*$,
diff --git 
a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java 
b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
index 12484e5..438c700 100644
--- a/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
+++ b/test/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java
@@ -1369,6 +1369,7 @@ public class ExtraInfoDescriptorImplTest {
 bridge-ip-versions v4=24.5);
   }
 
+  @Test(expected = DescriptorParseException.class)
   public void testBridgeIpTransportsDouble()
   throws DescriptorParseException {
 BridgeStatsBuilder.createWithBridgeIpTransportsLine(
@@ -1376,6 +1377,13 @@ public class ExtraInfoDescriptorImplTest {
   }
 
   @Test()
+  public void testBridgeIpTransportsUnderscore()
+  throws DescriptorParseException {
+BridgeStatsBuilder.createWithBridgeIpTransportsLine(
+bridge-ip-transports meek=32,obfs3_websocket=8,websocket=64);
+  }
+
+  @Test()
   public void testRouterSignatureOpt()
   throws DescriptorParseException {
 DescriptorBuilder.createWithRouterSignatureLines(opt 

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

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

2014-07-22 Thread karsten

commit dcfa4328ac7a6ca7f388bd48ddc66aab43d93f80
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jul 22 09:56:07 2014 +0200

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

diff --git a/deps/metrics-lib b/deps/metrics-lib
index 73e5a69..7b026cf 16
--- a/deps/metrics-lib
+++ b/deps/metrics-lib
@@ -1 +1 @@
-Subproject commit 73e5a6989df19923775978428cd9bb21e0a96dc4
+Subproject commit 7b026cf44ac775a990e42762c1151f973832ca8a

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

[tor-commits] r26882: {website} Add a FAQ entry about outgoing filters for Tor relays (website/trunk/docs/en)

2014-07-22 Thread Lunar

Author: lunar
Date: 2014-07-22 09:26:34 + (Tue, 22 Jul 2014)
New Revision: 26882

Modified:
   website/trunk/docs/en/faq.wml
Log:
Add a FAQ entry about outgoing filters for Tor relays


Modified: website/trunk/docs/en/faq.wml
===
--- website/trunk/docs/en/faq.wml   2014-07-22 06:35:49 UTC (rev 26881)
+++ website/trunk/docs/en/faq.wml   2014-07-22 09:26:34 UTC (rev 26882)
@@ -198,6 +198,7 @@
 account?/a/li
 lia href=#WrongIPMy relay is picking the wrong IP address./a/li
 lia href=#BehindANATI'm behind a NAT/Firewall/a/li
+lia href=#OutgoingFirewallHow should I configure my outgoing 
filters?/a/li
 lia href=#RelayMemoryWhy is my Tor relay using so much memory?
 /a/li
 lia href=#BetterAnonymityDo I get better anonymity if I run a relay?
@@ -2332,6 +2333,28 @@
 
 hr
 
+a id=OutgoingFirewall/a
+h3a class=anchor href=#BandwidthShapingHow should I configure
+my outgoing filters?/a/h3
+
+p
+Tor design assumes that any relay can reach every other relays. So
+all emoutgoing/em connections must be allowed.
+/p
+p
+Tor is promoting free network access without interference.
+Exit nodes must not attempt to filter any traffic coming from the
+Tor network. Selecting outgoing traffic is likely to forfeit the
+protections usually given to emcommon carriers/em in many
+jurisdictions.
+/p
+p
+Exit nodes which filter traffic will get the a
+href=#WhatIsTheBadExitFlagBadExit/a flag once detected.
+/p
+
+hr
+
 a id=BandwidthShaping/a
 h3a class=anchor href=#BandwidthShapingWhat bandwidth shaping
 options are available to Tor relays?/a/h3

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

[tor-commits] [obfsproxy/master] Do the release ritual for obfsproxy-0.2.11.

2014-07-22 Thread asn

commit 3a2c416b036e1a4bb7af06572d57bb225acc0996
Author: George Kadianakis desnac...@riseup.net
Date:   Wed Jul 16 18:30:41 2014 +0300

Do the release ritual for obfsproxy-0.2.11.
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bca3df6..c97ea11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.11 - UNRELEASED:
+Changes in version 0.2.11 - 2014-07-16:
  - Write a 'server_password' file with the scramblesuit password to
make it easier for bridge operators to find their password. Patch
by Philipp Winter. Fixes #10887.



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

[tor-commits] [obfsproxy/master] Add txsocksx and parsley as py2exe dependencies.

2014-07-22 Thread asn

commit 4d8bcb4b3671fd64d52040fa1cdfa35e48c17021
Author: George Kadianakis desnac...@riseup.net
Date:   Tue Jul 22 13:48:02 2014 +0300

Add txsocksx and parsley as py2exe dependencies.
---
 setup_py2exe.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_py2exe.py b/setup_py2exe.py
index 76a2360..ea1a7ab 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -14,7 +14,7 @@ setup(
 options={
 build: {build_base: build_path},
 py2exe: {
-includes: [twisted, pyptlib, Crypto],
+includes: [twisted, pyptlib, Crypto, parsley, 
txsocksx],
 dist_dir: dist_path,
 }
 }



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

[tor-commits] r26883: {website} add new mirror (website/trunk/include)

2014-07-22 Thread Andrew Lewman

Author: phobos
Date: 2014-07-22 13:46:17 + (Tue, 22 Jul 2014)
New Revision: 26883

Modified:
   website/trunk/include/tor-mirrors.csv
Log:
add new mirror 


Modified: website/trunk/include/tor-mirrors.csv
===
--- website/trunk/include/tor-mirrors.csv   2014-07-22 09:26:34 UTC (rev 
26882)
+++ website/trunk/include/tor-mirrors.csv   2014-07-22 13:46:17 UTC (rev 
26883)
@@ -104,3 +104,4 @@
 webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, 
FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , 
http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , 
 noc AT bbln DOT org, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, 
http://mirror2.bbln.org/torproject/, https://mirror2.bbln.org/torproject/, 
rsync://mirror2.bbln.org/torproject/, ftp://mirror2.bbln.org/torproject/, 
http://mirror2.bbln.org/torproject/dist/, 
https://mirror2.bbln.org/torproject/dist/, 
rsync://mirror2.bbln.org/torproject/dist/, , Sat Jul 19 23:55:06 2014
 noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, 
http://mirror.bbln.org/torproject/, https://mirror.bbln.org/torproject/, 
rsync://mirror.bbln.org/torproject/, ftp://mirror.bbln.org/torproject/, 
http://mirror.bbln.org/torproject/dist/, 
https://mirror.bbln.org/torproject/dist/, 
rsync://mirror.bbln.org/torproject/dist/, , Sat Jul 19 23:55:06 2014
+torsupport AT tb-itf DOT de, TB-ITF, , DE, Germany, Europe, TRUE, TRUE, No, 
http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , 
http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , ,

___
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

2014-07-22 Thread translation

commit a3ea0028d03e16ca258ace5be3867af96965fa02
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 14:15:33 2014 +

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

diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd
index d3988da..a4331d4 100644
--- a/sk_SK/torbirdy.dtd
+++ b/sk_SK/torbirdy.dtd
@@ -12,9 +12,9 @@
 !ENTITY torbirdy.prefs.save.button UloÅ¾iÅ¥
 !ENTITY torbirdy.prefs.save.key s
 !ENTITY torbirdy.prefs.cancel.button ZruÅ¡iÅ¥
-!ENTITY torbirdy.prefs.extra2.button Restore Defaults
+!ENTITY torbirdy.prefs.extra2.button ObnoviÅ¥ pÃ´vodnÃ© nastavenia
 !ENTITY torbirdy.prefs.extra2.key d
-!ENTITY torbirdy.prefs.testproxy.button Test Proxy Settings
+!ENTITY torbirdy.prefs.testproxy.button TestovaÅ¥ Proxy nastavenia
 !ENTITY torbirdy.prefs.testproxy.key p
 !ENTITY torbirdy.prefs.proxy.label Proxy
 !ENTITY torbirdy.prefs.privacy.label Privacy

___
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

2014-07-22 Thread translation

commit a959bd0cd09b12ee9150cd1ddc72334ad96029af
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 14:45:03 2014 +

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 aa625e9..2ea3575 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-07-22 14:11+\n
+PO-Revision-Date: 2014-07-22 14:31+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n
@@ -187,7 +187,7 @@ msgstr 
 
 #: lib/bridgedb/strings.py:114
 msgid Your browser is not displaying images properly.
-msgstr 
+msgstr VÃ¡Å¡ prehliadaÄ nezobrazuje obrÃ¡zky sprÃ¡vne.
 
 #: lib/bridgedb/strings.py:115
 msgid Enter the characters from the image above...

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

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

2014-07-22 Thread translation

commit a9a94d55a7b134684d54382fc598425b3aa5a939
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 14:45:07 2014 +

Update translations for gettor
---
 sk_SK/gettor.po |  503 +++
 1 file changed, 503 insertions(+)

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
new file mode 100644
index 000..6e52d97
--- /dev/null
+++ b/sk_SK/gettor.po
@@ -0,0 +1,503 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# once matejba...@gmail.com, 2014
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-01-19 13:40+0100\n
+PO-Revision-Date: 2014-07-22 14:43+\n
+Last-Translator: once matejba...@gmail.com\n
+Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Language: sk_SK\n
+Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n=2  n=4) ? 1 : 2;\n
+
+#: lib/gettor/i18n.py:27
+msgid Hello, This is the \GetTor\ robot.
+msgstr 
+
+#: lib/gettor/i18n.py:29
+msgid Thank you for your request.
+msgstr 
+
+#: lib/gettor/i18n.py:31
+msgid 
+Unfortunately, we won't answer you at this address. You should make\n
+an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n
+one of those.
+msgstr 
+
+#: lib/gettor/i18n.py:35
+msgid 
+We only process requests from email services that support \DKIM\,\n
+which is an email feature that lets us verify that the address in the\n
+\From\ line is actually the one who sent the mail.
+msgstr 
+
+#: lib/gettor/i18n.py:39
+msgid 
+(We apologize if you didn't ask for this mail. Since your email is from\n
+a service that doesn't use DKIM, we're sending a short explanation,\n
+and then we'll ignore this email address for the next day or so.)
+msgstr 
+
+#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
+msgid 
+If you have any questions or it doesn't work, you can contact a\n
+human at this support email address: h...@rt.torproject.org
+msgstr 
+
+#: lib/gettor/i18n.py:46
+msgid 
+I will mail you a Tor package, if you tell me which one you want.\n
+Please select one of the following package names:\n
+\n
+windows\n
+macos-i386\n
+macos-ppc\n
+linux-i386\n
+linux-x86_64\n
+obfs-windows\n
+obfs-macos-i386\n
+obfs-macos-x86_64\n
+obfs-linux-i386\n
+obfs-linux-x86_64\n
+source
+msgstr 
+
+#: lib/gettor/i18n.py:61
+msgid 
+Please reply to this mail, and tell me a single package name anywhere \n
+in the body of your email.
+msgstr 
+
+#: lib/gettor/i18n.py:64
+msgid 
+OBTAINING LOCALIZED VERSIONS OF TOR\n
+===
+msgstr 
+
+#: lib/gettor/i18n.py:67
+msgid 
+To get a version of Tor translated into your language, specify the\n
+language you want in the address you send the mail to:\n
+\n
+gettor...@torproject.org
+msgstr 
+
+#: lib/gettor/i18n.py:72
+msgid 
+This example will give you the requested package in a localized\n
+version for Farsi (Persian). Check below for a list of supported language\n
+codes. 
+msgstr 
+
+#: lib/gettor/i18n.py:76
+msgid  List of supported locales:
+msgstr 
+
+#: lib/gettor/i18n.py:78
+msgid Here is a list of all available languages:
+msgstr Tu je zoznam dostupnÃ½ch jazykov:
+
+#: lib/gettor/i18n.py:80
+msgid 
+gettor...@torproject.org: Arabic\n
+gettor...@torproject.org: German\n
+gettor...@torproject.org: English\n
+gettor...@torproject.org: Spanish\n
+gettor...@torproject.org: Farsi (Iran)\n
+gettor...@torproject.org: French\n
+gettor...@torproject.org: Italian\n
+gettor...@torproject.org: Dutch\n
+gettor...@torproject.org: Polish\n
+gettor...@torproject.org: Russian\n
+gettor...@torproject.org: Chinese
+msgstr 
+
+#: lib/gettor/i18n.py:92
+msgid If you select no language, you will receive the English version.
+msgstr Ak si nevyberiete Å¾iadny jazyk, bude zvolenÃ¡ anglickÃ¡ verzia.
+
+#: lib/gettor/i18n.py:94
+msgid 
+SMALLER SIZED PACKAGES\n
+==
+msgstr 
+
+#: lib/gettor/i18n.py:97
+msgid 
+If your bandwith is low or your provider doesn't allow you to\n
+receive large attachments in your email, GetTor can send you several\n
+small packages instead of one big one.
+msgstr 
+
+#: lib/gettor/i18n.py:101
+msgid 
+Simply include the keyword 'split' in a new line on its own (this part\n
+is important!) like so: \n
+\n
+windows\n
+split
+msgstr 
+
+#: lib/gettor/i18n.py:107
+msgid 
+Sending this text in an email to GetTor will cause it to send you \n
+the Tor Browser Bundle in a number of 1,4MB attachments.
+msgstr 
+
+#: lib/gettor/i18n.py:110
+msgid 
+After having received all parts, you need to re-assemble them to \n
+one package again. This is done as

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

2014-07-22 Thread translation

commit 3d303e20f58d3e523e0fa97ba1095db6ca05bd4c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 15:15:06 2014 +

Update translations for gettor
---
 sk_SK/gettor.po |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
index 6e52d97..3c352ac 100644
--- a/sk_SK/gettor.po
+++ b/sk_SK/gettor.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2014-07-22 14:43+\n
+PO-Revision-Date: 2014-07-22 15:14+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n
@@ -20,11 +20,11 @@ msgstr 
 
 #: lib/gettor/i18n.py:27
 msgid Hello, This is the \GetTor\ robot.
-msgstr 
+msgstr Ahoj, tu je \GetTor\ robot.
 
 #: lib/gettor/i18n.py:29
 msgid Thank you for your request.
-msgstr 
+msgstr Äakujeme za vaÅ¡u poÅ¾iadavku.
 
 #: lib/gettor/i18n.py:31
 msgid 
@@ -38,14 +38,14 @@ msgid 
 We only process requests from email services that support \DKIM\,\n
 which is an email feature that lets us verify that the address in the\n
 \From\ line is actually the one who sent the mail.
-msgstr 
+msgstr SpracovÃ¡vame iba poÅ¾iadavky z e-mailovÃ½ch sluÅ¾ieb podporujÃºcich 
\DKIM\,\nÄo je funkcia e-mailu, ktorÃ¡ nÃ¡m umoÅ¾nÃ overiÅ¥, Å¾e adresa v 
riadku \Od\ je\nskutoÄne od toho, kto odoslal e-mail.
 
 #: lib/gettor/i18n.py:39
 msgid 
 (We apologize if you didn't ask for this mail. Since your email is from\n
 a service that doesn't use DKIM, we're sending a short explanation,\n
 and then we'll ignore this email address for the next day or so.)
-msgstr 
+msgstr (OspravedlÅujeme sa, ak ste o tento e-mail neÅ¾iadal vy. KeÄÅ¾e 
vÃ¡Å¡\nposkytovateÄ¾ e-mailu nepouÅ¾Ãva DKIM, posielame krÃ¡tke 
vysvetlenie.\nTÃºto e-mailovÃº adresu budeme asi jeden deÅ ignorovaÅ¥.)
 
 #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
 msgid 
@@ -100,7 +100,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:76
 msgid  List of supported locales:
-msgstr 
+msgstr Zoznam podporovanÃ½ch lokalizÃ¡ciÃ:
 
 #: lib/gettor/i18n.py:78
 msgid Here is a list of all available languages:
@@ -151,13 +151,13 @@ msgstr 
 msgid 
 Sending this text in an email to GetTor will cause it to send you \n
 the Tor Browser Bundle in a number of 1,4MB attachments.
-msgstr 
+msgstr Odoslanie tohoto textu v e-maile na adresu GetTor spÃ´sobÃ, Å¾e 
vÃ¡m\nz neho prÃde Tor Browser Bundle v niekoÄ¾kÃ½ch prÃlohÃ¡ch s veÄ¾kosÅ¥ou 
1,4MB.
 
 #: lib/gettor/i18n.py:110
 msgid 
 After having received all parts, you need to re-assemble them to \n
 one package again. This is done as follows:
-msgstr 
+msgstr Potom, Äo obrÅ¾Ãte vÅ¡etky Äasti, je potrebnÃ©, aby ste ich znova 
spojili\ndo jednÃ©ho balÃÄka. To vykonÃ¡te nasledovne:
 
 #: lib/gettor/i18n.py:113
 msgid 1.) Save all received attachments into one folder on your disk.
@@ -188,11 +188,11 @@ msgid 
 5.) After unpacking is finished, you should find a newly created \n
 \.exe\ file in your destination folder. Simply doubleclick\n
 that and Tor Browser Bundle should start within a few seconds.
-msgstr 
+msgstr 5.) Potom, Äo rozbaÄ¾ovanie skonÄilo, nÃ¡jdite novovytvorenÃ½ 
\.exe\ sÃºbor\nv cieÄ¾ovom prieÄinku. StaÄÃ dvojklikom otvoriÅ¥ tento 
sÃºbor\na Tor Browser Bundle by sa mal v priebehu niekoÄ¾kÃ½ch sekÃºnd 
spustiÅ¥.
 
 #: lib/gettor/i18n.py:130
 msgid 6.) That's it. You're done. Thanks for using Tor and have fun!
-msgstr 
+msgstr 6.) Hotovo. To je vÅ¡etko. Äakujeme, Å¾e pouÅ¾Ãvate Tor a prajeme 
veÄ¾a zÃ¡bavy!
 
 #: lib/gettor/i18n.py:132
 msgid 
@@ -436,11 +436,11 @@ msgstr 
 
 #: lib/gettor/i18n.py:272
 msgid What is Tor?
-msgstr 
+msgstr Äo je Tor?
 
 #: lib/gettor/i18n.py:274
 msgid The name \Tor\ can refer to several different components.
-msgstr 
+msgstr NÃ¡zov \Tor\ sa mÃ´Å¾e viazaÅ¥ na niekoÄ¾ko rÃ´znych komponentov.
 
 #: lib/gettor/i18n.py:276
 msgid 
@@ -457,7 +457,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:286
 msgid What is the Tor Browser Bundle?
-msgstr 
+msgstr Äo je Tor Browser Bundle?
 
 #: lib/gettor/i18n.py:288
 msgid 
@@ -468,7 +468,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:292
 msgid What package should I request?
-msgstr 
+msgstr KtorÃ½ balÃÄek by som si mal vyÅ¾iadaÅ¥?
 
 #: lib/gettor/i18n.py:294
 msgid 
@@ -480,15 +480,15 @@ msgstr 
 
 #: lib/gettor/i18n.py:299
 msgid How do I extract the file(s) you sent me?
-msgstr 
+msgstr Ako rozbalÃm sÃºbor(y), ktorÃ© ste mi poslali?
 
 #: lib/gettor/i18n.py:301
 msgid QUESTION:
-msgstr 
+msgstr OTÃZKA:
 
 #: lib/gettor/i18n.py:303
 msgid ANSWER:
-msgstr 
+msgstr ODPOVEÄ:
 
 #: lib/gettor/i18n.py:305
 #, python-format

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

[tor-commits] [onionoo/master] Move front-end parts of NodeStatus to SummaryDocument.

2014-07-22 Thread karsten

commit ab7f4ee58825a7980579e6cd4e334ee373b29047
Author: Karsten Loesing karsten.loes...@gmx.net
Date:   Tue Jul 22 13:53:42 2014 +0200

Move front-end parts of NodeStatus to SummaryDocument.

The NodeStatus class was seriously overloaded:

 1. NodeDetailsStatusUpdater uses the list of NodeStatus instances as
input to its GeoIP and rDNS look-up operations and to calculate
path-selection probabilities.

 2. DetailsDocumentWriter uses fields from NodeStatus instances (some of
them being stored persistently, some only kept in memory) to write
part of DetailsDocument instances.

 3. NodeIndexer obtains all relevant data to populate the search index
from NodeStatus instances.

 4. ResponseBuilder uses NodeStatus instances to produce summary documents
on-the-fly.

As first step to reduce this complexity, let's copy the parts used for 3
and 4 to a currently unused class, SummaryDocument, and use that class in
NodeIndexer and ResponseBuilder.  It makes sense to combine those two
purposes for performance reasons.  Parts 1 and 2 will be simplified in
later commits.
---
 src/org/torproject/onionoo/DocumentStore.java  |  235 +---
 src/org/torproject/onionoo/Main.java   |4 +-
 .../onionoo/NodeDetailsStatusUpdater.java  |2 +-
 src/org/torproject/onionoo/NodeIndexer.java|   38 ++--
 src/org/torproject/onionoo/RequestHandler.java |   65 +++---
 src/org/torproject/onionoo/ResponseBuilder.java|   52 ++---
 src/org/torproject/onionoo/SummaryDocument.java|  195 +++-
 .../torproject/onionoo/SummaryDocumentWriter.java  |   87 
 .../org/torproject/onionoo/DummyDocumentStore.java |2 +-
 .../torproject/onionoo/ResourceServletTest.java|  107 +
 10 files changed, 569 insertions(+), 218 deletions(-)

diff --git a/src/org/torproject/onionoo/DocumentStore.java 
b/src/org/torproject/onionoo/DocumentStore.java
index e3bf618..434ecb6 100644
--- a/src/org/torproject/onionoo/DocumentStore.java
+++ b/src/org/torproject/onionoo/DocumentStore.java
@@ -11,7 +11,9 @@ import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.SortedSet;
@@ -43,46 +45,39 @@ public class DocumentStore {
 this.time = ApplicationFactory.getTime();
   }
 
-  private boolean listedArchivedNodeStatuses = false,
-  listedCurrentNodeStatuses = false;
-
   private long listOperations = 0L, listedFiles = 0L, storedFiles = 0L,
   storedBytes = 0L, retrievedFiles = 0L, retrievedBytes = 0L,
   removedFiles = 0L;
 
-  /* Node statuses are cached in memory, as opposed to all other document
-   * types.  This cache is initialized when listing NodeStatus documents,
-   * either including or excluding archived node statuses.  Later retrieve
-   * operations depend on which NodeStatus documents were listed. */
+  /* Node statuses and summary documents are cached in memory, as opposed
+   * to all other document types.  These caches are initialized when first
+   * accessing or modifying a NodeStatus or SummaryDocument document,
+   * respectively. */
   private SortedMapString, NodeStatus cachedNodeStatuses;
+  private SortedMapString, SummaryDocument cachedSummaryDocuments;
 
   public T extends Document SortedSetString list(
-  ClassT documentType, boolean includeArchive) {
+  ClassT documentType) {
 if (documentType.equals(NodeStatus.class)) {
-  return this.listNodeStatuses(includeArchive);
+  return this.listNodeStatuses();
+} else if (documentType.equals(SummaryDocument.class)) {
+  return this.listSummaryDocuments();
 } else {
   return this.listDocumentFiles(documentType);
 }
   }
 
-  private SortedSetString listNodeStatuses(boolean includeArchive) {
-if ((includeArchive  listedCurrentNodeStatuses) ||
-(!includeArchive  listedArchivedNodeStatuses)) {
-  System.err.println(Listing node statuses is only permitted 
-  + including the archive or excluding the archive, but not 
-  + both.  Returning empty list.);
-  return new TreeSetString();
-}
+  private SortedSetString listNodeStatuses() {
 if (this.cachedNodeStatuses == null) {
-  this.cacheNodeStatuses(includeArchive);
+  this.cacheNodeStatuses();
 }
 return new TreeSetString(this.cachedNodeStatuses.keySet());
   }
 
-  private void cacheNodeStatuses(boolean includeArchive) {
+  private void cacheNodeStatuses() {
 SortedMapString, NodeStatus parsedNodeStatuses =
 new TreeMapString, NodeStatus();
-File directory = includeArchive ? this.statusDir : this.outDir;
+File directory = this.statusDir;
 if (directory != null) {
   File summaryFile = new File(directory,

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

2014-07-22 Thread translation

commit 9be51765dd0fa3e0cca623277efddb7e0e6b7934
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 15:45:10 2014 +

Update translations for gettor
---
 sk_SK/gettor.po |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
index 3c352ac..7dd4406 100644
--- a/sk_SK/gettor.po
+++ b/sk_SK/gettor.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2014-07-22 15:14+\n
+PO-Revision-Date: 2014-07-22 15:43+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n
@@ -31,7 +31,7 @@ msgid 
 Unfortunately, we won't answer you at this address. You should make\n
 an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n
 one of those.
-msgstr 
+msgstr BohuÅ¾iaÄ¾, nedokÃ¡Å¾eme vÃ¡m na tejto adrese odpovedaÅ¥. Mali by ste 
si vytvoriÅ¥ ÃºÄet\nna GMAIL.COM, YAHOO.COM alebo YAHOO.CN a z neho odoslaÅ¥ 
e-mail.
 
 #: lib/gettor/i18n.py:35
 msgid 
@@ -51,7 +51,7 @@ msgstr (OspravedlÅujeme sa, ak ste o tento e-mail neÅ¾iadal 
vy. KeÄÅ¾e vÃ¡Å¡\
 msgid 
 If you have any questions or it doesn't work, you can contact a\n
 human at this support email address: h...@rt.torproject.org
-msgstr 
+msgstr Ak mÃ¡te nejakÃ© otÃ¡zky alebo nieÄo nefunguje, mÃ´Å¾ete 
kontaktovaÅ¥\nÅ¾ivÃº osobu na tejto adrese e-mailovej podpory: 
h...@rt.torproject.org
 
 #: lib/gettor/i18n.py:46
 msgid 
@@ -69,19 +69,19 @@ msgid 
 obfs-linux-i386\n
 obfs-linux-x86_64\n
 source
-msgstr 
+msgstr OdoÅ¡lem vÃ¡m balÃÄek Tor, staÄÃ povedaÅ¥, ktorÃ½ chcete.\nVyberte 
si, prosÃm, jeden z nasledujÃºcich nÃ¡zvov balÃÄkov:\n\nwindows\n
macos-i386\nmacos-ppc\nlinux-i386\nlinux-x86_64\nobfs-windows\n 
   obfs-macos-i386\nobfs-macos-x86_64\nobfs-linux-i386\n
obfs-linux-x86_64\nsource
 
 #: lib/gettor/i18n.py:61
 msgid 
 Please reply to this mail, and tell me a single package name anywhere \n
 in the body of your email.
-msgstr 
+msgstr Odpovedzte, prosÃm, na tento e-mail a hocikde v obsahu vaÅ¡ej 
odpovede\nmi napÃÅ¡te nÃ¡zov jednÃ©ho balÃÄka.
 
 #: lib/gettor/i18n.py:64
 msgid 
 OBTAINING LOCALIZED VERSIONS OF TOR\n
 ===
-msgstr 
+msgstr ZÃSKANIE LOKALIZOVANEJ VERZIE 
TOR\n===
 
 #: lib/gettor/i18n.py:67
 msgid 
@@ -89,14 +89,14 @@ msgid 
 language you want in the address you send the mail to:\n
 \n
 gettor...@torproject.org
-msgstr 
+msgstr Pre zÃskanie verzie Tor vo vaÅ¡om jazyku, uveÄte poÅ¾adovanÃ½ jazyk 
do mena adresÃ¡ta vÃ¡Å¡ho e-mailu:\n\ngettor...@torproject.org
 
 #: lib/gettor/i18n.py:72
 msgid 
 This example will give you the requested package in a localized\n
 version for Farsi (Persian). Check below for a list of supported language\n
 codes. 
-msgstr 
+msgstr Tento prÃklad by vÃ¡m dodal verziu balÃÄka preloÅ¾enÃº do Farsi 
(perzÅ¡tiny).\nNiÅ¾Å¡ie nÃ¡jdete zoznam podporovanÃ½ch jazykovÃ½ch kÃ³dov.
 
 #: lib/gettor/i18n.py:76
 msgid  List of supported locales:
@@ -119,7 +119,7 @@ msgid 
 gettor...@torproject.org: Polish\n
 gettor...@torproject.org: Russian\n
 gettor...@torproject.org: Chinese
-msgstr 
+msgstr gettor...@torproject.org: ArabÄina\n
gettor...@torproject.org: NemÄina\ngettor...@torproject.org: 
AngliÄtina\ngettor...@torproject.org: Å panielÄina\n
gettor...@torproject.org: Farsi (perzÄtina)\ngettor...@torproject.org: 
FrancÃºzÅ¡tina\ngettor...@torproject.org: TalianÄina\n
gettor...@torproject.org: HolandÅ¡tina\ngettor...@torproject.org: 
PolÅ¡tina\ngettor...@torproject.org: RuÅ¡tina\n
gettor...@torproject.org: ÄÃnÅ¡tina
 
 #: lib/gettor/i18n.py:92
 msgid If you select no language, you will receive the English version.
@@ -129,7 +129,7 @@ msgstr Ak si nevyberiete Å¾iadny jazyk, bude zvolenÃ¡ 
anglickÃ¡ verzia.
 msgid 
 SMALLER SIZED PACKAGES\n
 ==
-msgstr 
+msgstr BALÃÄKY S MENÅ OU VEÄ½KOSÅ¤OU\n==
 
 #: lib/gettor/i18n.py:97
 msgid 
@@ -432,7 +432,7 @@ msgstr 
 msgid 
 FREQUENTLY ASKED QUESTIONS\n
 ==
-msgstr 
+msgstr ÄASTO KLADENÃ OTÃZKY\n==
 
 #: lib/gettor/i18n.py:272
 msgid What is Tor?
@@ -464,7 +464,7 @@ msgid 
 The Browser Bundle (TBB) is the package we recommend to most users. \n
 The bundle comes with everything you need to safely browse the Internet.\n
 Just extract it and run.
-msgstr 
+msgstr Tor Browser Bundle (TBB) je balÃÄek, ktorÃ½ odporÃºÄame vÃ¤ÄÅ¡ine 
uÅ¾ÃvateÄ¾ov.\nZvÃ¤zok obsahuje vÅ¡etko, Äo potrebujete na bezpeÄenÃ© 
surfovanie\npo Internete. StaÄÃ rozbaliÅ¥ a spustiÅ¥.
 
 #: lib/gettor/i18n.py:292
 msgid What package should

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

2014-07-22 Thread translation

commit 01cb8d514ce43d296c63ee6e54b7619fb4ba7b74
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 16:15:05 2014 +

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

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
index 7dd4406..568da55 100644
--- a/sk_SK/gettor.po
+++ b/sk_SK/gettor.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2014-07-22 15:43+\n
+PO-Revision-Date: 2014-07-22 16:01+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n
@@ -136,7 +136,7 @@ msgid 
 If your bandwith is low or your provider doesn't allow you to\n
 receive large attachments in your email, GetTor can send you several\n
 small packages instead of one big one.
-msgstr 
+msgstr Ak je vÃ¡Å¡ prenosovÃ½ rozsah nÃzky alebo vÃ¡Å¡ poskytovateÄ¾ 
nepovoÄ¾uje veÄ¾kÃ© prÃlohy v e-mailoch, GetTor vÃ¡m mÃ´Å¾e poslaÅ¥ viacero 
malÃ½ch balÃÄkov namiesto jednÃ©ho veÄ¾kÃ©ho.
 
 #: lib/gettor/i18n.py:101
 msgid 
@@ -145,7 +145,7 @@ msgid 
 \n
 windows\n
 split
-msgstr 
+msgstr StaÄÃ len uviesÅ¥ kÄ¾ÃºÄovÃ© slovo 'split' na samostatnom novom 
riadku (toto \nje dÃ´leÅ¾ÃtÃ©) tak ako v prÃklade:\n\nwindows\nsplit
 
 #: lib/gettor/i18n.py:107
 msgid 
@@ -198,13 +198,13 @@ msgstr 6.) Hotovo. To je vÅ¡etko. Äakujeme, Å¾e 
pouÅ¾Ãvate Tor a prajeme veÄ¾
 msgid 
 SUPPORT\n
 ===
-msgstr 
+msgstr PODPORA\n===
 
 #: lib/gettor/i18n.py:138
 msgid 
 Here's your requested software as a zip file. Please unzip the\n
 package and verify the signature.
-msgstr 
+msgstr Tu je vami poÅ¾adovanÃ½ program v sÃºbore zip. ProsÃm, rozbaÄ¾te 
balÃÄek\na overte jeho podpis.
 
 #: lib/gettor/i18n.py:141
 msgid 
@@ -214,14 +214,14 @@ msgid 
 tool as follows after unpacking the zip file:\n
 \n
 gpg --verify tor-browser-1.3.24_en-US.exe.asc 
tor-browser-1.3.24_en-US.exe
-msgstr 
+msgstr VERIFY SIGNATURE\n\nAk mÃ¡ vÃ¡Å¡ poÄÃtaÄ 
nainÅ¡talovanÃ© GnuPG, pouÅ¾ite po rozbalenÃ prÃkazovÃ½ riadok pre gpg tak 
ako je uvedenÃ©:\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc 
tor-browser-1.3.24_en-US.exe
 
 #: lib/gettor/i18n.py:148
 msgid 
 The output should look somewhat like this:\n
 \n
 gpg: Good signature from 'Erinn Clark ...'
-msgstr 
+msgstr VÃ½stup by mal vyzeraÅ¥ asi takto:\n\ngpg: Good signature from 
'Erinn Clark ...'
 
 #: lib/gettor/i18n.py:152
 msgid 
@@ -229,13 +229,13 @@ msgid 
 a graphical user interface for GnuPG on this website:\n
 \n
 http://www.gnupg.org/related_software/frontends.html;
-msgstr 
+msgstr Ak neovlÃ¡date nÃ¡stroje prÃkazovÃ©ho riadka, rozhliadnite sa po 
grafickom uÅ¾ÃvateÄ¾skom rozhranÃ pre GnuPG na jeho strÃ¡nkach:\n\n
http://www.gnupg.org/related_software/frontends.html;
 
 #: lib/gettor/i18n.py:157
 msgid 
 BLOCKED ACCESS / CENSORSHIP\n
 ===
-msgstr 
+msgstr BLOKOVANÃ PRÃSTUP / CENZÃRA\n===
 
 #: lib/gettor/i18n.py:160
 msgid 

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

[tor-commits] r26884: {website} Remove duplication about outgoing firewalls by splitting use (website/trunk/docs/en)

2014-07-22 Thread Lunar

Author: lunar
Date: 2014-07-22 16:24:08 + (Tue, 22 Jul 2014)
New Revision: 26884

Modified:
   website/trunk/docs/en/faq.wml
Log:
Remove duplication about outgoing firewalls by splitting uses cases between 
client and relay


Modified: website/trunk/docs/en/faq.wml
===
--- website/trunk/docs/en/faq.wml   2014-07-22 13:46:17 UTC (rev 26883)
+++ website/trunk/docs/en/faq.wml   2014-07-22 16:24:08 UTC (rev 26884)
@@ -48,8 +48,8 @@
 lia href=#IsItWorkingHow can I tell if Tor is working, and that my
 connections really are anonymized?/a/li
 lia href=#MobileCan I use Tor on my phone or mobile device?/a/li
-lia href=#OutboundPortsDo I have to open all these outbound ports
-on my firewall?/a/li
+lia href=#OutboundPortsWhich outbound ports must be open when
+using Tor as a client?/a/li
 lia href=#FTPHow do I use my browser for ftp with Tor?/a/li
 lia href=#NoDataScrubbingDoes Tor remove personal information
 from the data my application sends?/a/li
@@ -882,10 +882,9 @@
 
 hr
 
- a id=OutboundPorts/a
-h3a class=anchor href=#OutboundPortsDo I have to open all these
-outbound ports on my firewall?/a/h3
-
+a id=OutboundPorts/a
+h3a class=anchor href=#OutboundPortsWhich outbound ports must be 
open when
+using Tor as a client?/a/h3
 p
 Tor may attempt to connect to any port that is advertised in the
 directory as an ORPort (for making Tor connections) or a DirPort (for
@@ -894,7 +893,7 @@
 ports too.
 /p
 p
-As a client: you could probably get away with opening only those four
+When using Tor as a client, you could probably get away with opening only 
those four
 ports. Since Tor does all its connections in the background, it will retry
 ones that fail, and hopefully you'll never have to know that it failed, as
 long as it finds a working one often enough. However, to get the most
@@ -905,14 +904,6 @@
 you want to explicitly tell your Tor client which ports are reachable
 for you.
 /p
-p
-As a relay: you must allow outgoing connections to every other relay
-and to anywhere your exit policy advertises that you allow. The
-cleanest way to do that is simply to allow all outgoing connections
-at your firewall. If you don't, clients will ask you to extend to
-those relays, and those connections will fail, leading to complex
-anonymity implications for the clients which we'd like to avoid.
-/p
 
 hr
 
@@ -2334,7 +2325,7 @@
 hr
 
 a id=OutgoingFirewall/a
-h3a class=anchor href=#BandwidthShapingHow should I configure
+h3a class=anchor href=#OutgoingFirewallHow should I configure
 my outgoing filters?/a/h3
 
 p

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

[tor-commits] [flashproxy/master] Increase version number to 1.7.

2014-07-22 Thread dcf

commit a3fe8c49c679051d90adb04e7d5aae51fcee9c72
Author: David Fifield da...@bamsoftware.com
Date:   Tue Jul 22 08:58:41 2014 -0700

Increase version number to 1.7.
---
 ChangeLog|1 +
 facilitator/configure.ac |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 18582ce..759f7d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+Changes in version 1.7
   o Fixed a bug in the browser proxy which caused it to stop accepting
 new connections once it had failed 5 previous connections.
 
diff --git a/facilitator/configure.ac b/facilitator/configure.ac
index 3c034fb..2f56c1a 100644
--- a/facilitator/configure.ac
+++ b/facilitator/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([flashproxy-facilitator], [1.6])
+AC_INIT([flashproxy-facilitator], [1.7])
 AM_INIT_AUTOMAKE([-Wall foreign])
 
 AC_ARG_VAR(fpfacilitatoruser, [the user/group for the facilitator to run as])



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

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

2014-07-22 Thread translation

commit 23a39f6229cdafd899213094f285a9862c4ea60c
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 16:45:05 2014 +

Update translations for gettor
---
 sk_SK/gettor.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
index 568da55..7daddcd 100644
--- a/sk_SK/gettor.po
+++ b/sk_SK/gettor.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2014-07-22 16:01+\n
+PO-Revision-Date: 2014-07-22 16:38+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n

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

[tor-commits] [tor-browser-bundle/master] Bug 12381, 12673: Squashed + merged kpdyer/master.

2014-07-22 Thread gk

commit 3135c79f586cc635fe6c8ab88b800ec9065dff90
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 19:04:32 2014 +

Bug 12381, 12673: Squashed + merged kpdyer/master.

This hopefully fixes fte over proxy support (12381) and adds new fte
bridges (12673).
---
 Bundle-Data/PTConfigs/bridge_prefs.js |   22 +-
 gitian/versions   |2 +-
 gitian/versions.alpha |2 +-
 gitian/versions.beta  |2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 5a1532e..6ee714d 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -16,11 +16,23 @@ pref(extensions.torlauncher.default_bridge.flashproxy.3, 
flashproxy 0.0.1.0:3
 pref(extensions.torlauncher.default_bridge.flashproxy.4, flashproxy 
0.0.1.0:4);
 pref(extensions.torlauncher.default_bridge.flashproxy.5, flashproxy 
0.0.1.0:5);
 
-pref(extensions.torlauncher.default_bridge.fte.1, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.2, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.4, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.5, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
+// ipv4
+pref(extensions.torlauncher.default_bridge.fte.1, fte 
t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.2, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.4, fte 
server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.6, fte 
server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.7, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.8, fte 
server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.9, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.10, fte 
server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.11, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
+pref(extensions.torlauncher.default_bridge.fte.12, fte 
server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09);
+// /ipv4
+// ipv6
+pref(extensions.torlauncher.default_bridge.fte.13, fte 
ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+// /ipv6
 
 pref(extensions.torlauncher.default_bridge.scramblesuit.1, scramblesuit 
188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C 
password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI);
 pref(extensions.torlauncher.default_bridge.scramblesuit.2, scramblesuit 
188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E 
password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T);
diff --git a/gitian/versions b/gitian/versions
index 0372cf7..b51c2af 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.9
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15
+FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 6be86bd..e8957a0 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.9
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15
+FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
diff --git a/gitian/versions.beta b/gitian/versions.beta
index aedcf44..2e2754a 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@

[tor-commits] [tor-browser-bundle/maint-3.6] Bug 12381, 12673: Squashed + merged kpdyer/master.

2014-07-22 Thread gk

commit e0e68e5713f6db5ca2756f7082094cb421c067a2
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 19:22:08 2014 +

Bug 12381, 12673: Squashed + merged kpdyer/master.

This hopefully fixes fte over proxy support (12381) and adds new fte
bridges (12673).
---
 Bundle-Data/PTConfigs/bridge_prefs.js |   22 +-
 gitian/versions   |2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 6d8ac38..9cb8a6a 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -16,11 +16,23 @@ pref(extensions.torlauncher.default_bridge.flashproxy.3, 
flashproxy 0.0.1.0:3
 pref(extensions.torlauncher.default_bridge.flashproxy.4, flashproxy 
0.0.1.0:4);
 pref(extensions.torlauncher.default_bridge.flashproxy.5, flashproxy 
0.0.1.0:5);
 
-pref(extensions.torlauncher.default_bridge.fte.1, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.2, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.4, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.5, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
+// ipv4
+pref(extensions.torlauncher.default_bridge.fte.1, fte 
t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.2, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.4, fte 
server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.6, fte 
server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.7, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.8, fte 
server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.9, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.10, fte 
server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.11, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
+pref(extensions.torlauncher.default_bridge.fte.12, fte 
server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09);
+// /ipv4
+// ipv6
+pref(extensions.torlauncher.default_bridge.fte.13, fte 
ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+// /ipv6
 
 //pref(extensions.torlauncher.default_bridge.scramblesuit.1, scramblesuit 
188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C 
password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI);
 //pref(extensions.torlauncher.default_bridge.scramblesuit.2, scramblesuit 
188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E 
password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T);
diff --git a/gitian/versions b/gitian/versions
index a8a6fb7..17e2e37 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.9
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15
+FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 

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

[tor-commits] [tor-browser-bundle/maint-3.6] Bug 12381: Added new obfsproxy tag.

2014-07-22 Thread gk

commit 3ecbd771e26aaa36f3603be6196d90d245c54e41
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 19:26:48 2014 +

Bug 12381: Added new obfsproxy tag.
---
 gitian/versions |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions b/gitian/versions
index 17e2e37..c0e5047 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.6
-OBFSPROXY_TAG=obfsproxy-0.2.9
+OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17

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

[tor-commits] [tor-browser-bundle/master] Bug 12381: Added new obfsproxy tag.

2014-07-22 Thread gk

commit 77f4826e45678a62e909b6803176650e8de47962
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 19:28:40 2014 +

Bug 12381: Added new obfsproxy tag.
---
 gitian/versions   |2 +-
 gitian/versions.alpha |2 +-
 gitian/versions.beta  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index b51c2af..657cc50 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0
 PYPTLIB_TAG=pyptlib-0.0.6
-OBFSPROXY_TAG=obfsproxy-0.2.9
+OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e8957a0..1250075 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0
 PYPTLIB_TAG=pyptlib-0.0.6
-OBFSPROXY_TAG=obfsproxy-0.2.9
+OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 2e2754a..f45bc9b 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
 MINGW_REV=6184
 PYPTLIB_TAG=pyptlib-0.0.6
-OBFSPROXY_TAG=obfsproxy-0.2.9
+OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2
 FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17

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

[tor-commits] r26885: {website} allow old torbutton link to redirect (website/trunk)

2014-07-22 Thread Roger Dingledine

Author: arma
Date: 2014-07-22 18:08:17 + (Tue, 22 Jul 2014)
New Revision: 26885

Modified:
   website/trunk/.htaccess
Log:
allow old torbutton link to redirect


Modified: website/trunk/.htaccess
===
--- website/trunk/.htaccess 2014-07-22 16:24:08 UTC (rev 26884)
+++ website/trunk/.htaccess 2014-07-22 18:08:17 UTC (rev 26885)
@@ -10,6 +10,7 @@
 
 # Torbutton
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]
+RewriteRule ^torbutton/(.*) /docs/torbutton/$1 [R=301,L]
 
 # Tor Browser
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]

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

[tor-commits] [tor-browser-bundle/master] Bug 12381: Add the real fte 0.2.17 commit.

2014-07-22 Thread gk

commit 7bc4b8471a2bc81a9c1d60a2e696764421852995
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 20:14:07 2014 +

Bug 12381: Add the real fte 0.2.17 commit.
---
 gitian/versions   |2 +-
 gitian/versions.alpha |2 +-
 gitian/versions.beta  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 657cc50..6b72a2e 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
+FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 1250075..1b1d7d7 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
+FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
diff --git a/gitian/versions.beta b/gitian/versions.beta
index f45bc9b..16692b2 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2
-FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
+FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2

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

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

2014-07-22 Thread translation

commit 2bc220ea8f3f8ee5627d7290d03c807a0233d1cb
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 18:16:16 2014 +

Update translations for tails-perl5lib_completed
---
 ar.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ar.po b/ar.po
index 994b1de..4eebf87 100644
--- a/ar.po
+++ b/ar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Karimation karim.1...@live.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2013-11-28 11:56+0100\n
-PO-Revision-Date: 2013-12-30 04:50+\n
-Last-Translator: Phoul co...@torproject.org\n
+POT-Creation-Date: 2014-06-24 11:37+0200\n
+PO-Revision-Date: 2014-07-22 18:12+\n
+Last-Translator: Karimation karim.1...@live.com\n
 Language-Team: Arabic 
(http://www.transifex.com/projects/p/torproject/language/ar/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -17,8 +18,8 @@ msgstr 
 Language: ar\n
 Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3  
n%100=10 ? 3 : n%100=11  n%100=99 ? 4 : 5;\n
 
-#: ../lib/Tails/RunningSystem.pm:139
+#: ../lib/Tails/RunningSystem.pm:153
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
-msgstr Ø§ÙØ¬ÙØ§Ø² Ø§ÙØ°Ù ÙØ¹ÙÙ ØªÙÙØ² ÙÙ Ø¹ÙÙÙ ØºÙØ± Ù
ÙØ¬ÙØ¯. Ø±Ø¨ÙØ§ Ø§Ø³ØªØ®Ø¯ÙØª Ø®ÙØ§Ø± toram Ø
+msgstr Ø§ÙØ¬ÙØ§Ø² Ø§ÙØ°Ù ÙØ¹ÙÙ ØªÙÙØ² ÙÙ Ø¹ÙÙÙ ØºÙØ± Ù
ÙØ¬ÙØ¯. Ø±Ø¨ÙØ§ Ø§Ø³ØªØ®Ø¯ÙØª Ø®ÙØ§Ø± 'ØªÙØ±Ø§Ù' Ø

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

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

2014-07-22 Thread translation

commit e463c54acea2a4ac5f3924392fd5e73830147e8b
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 18:16:14 2014 +

Update translations for tails-perl5lib
---
 ar.po |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ar.po b/ar.po
index 994b1de..4eebf87 100644
--- a/ar.po
+++ b/ar.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Karimation karim.1...@live.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2013-11-28 11:56+0100\n
-PO-Revision-Date: 2013-12-30 04:50+\n
-Last-Translator: Phoul co...@torproject.org\n
+POT-Creation-Date: 2014-06-24 11:37+0200\n
+PO-Revision-Date: 2014-07-22 18:12+\n
+Last-Translator: Karimation karim.1...@live.com\n
 Language-Team: Arabic 
(http://www.transifex.com/projects/p/torproject/language/ar/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -17,8 +18,8 @@ msgstr 
 Language: ar\n
 Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3  
n%100=10 ? 3 : n%100=11  n%100=99 ? 4 : 5;\n
 
-#: ../lib/Tails/RunningSystem.pm:139
+#: ../lib/Tails/RunningSystem.pm:153
 msgid 
 The device Tails is running from cannot be found. Maybe you used the `toram'
  option?
-msgstr Ø§ÙØ¬ÙØ§Ø² Ø§ÙØ°Ù ÙØ¹ÙÙ ØªÙÙØ² ÙÙ Ø¹ÙÙÙ ØºÙØ± Ù
ÙØ¬ÙØ¯. Ø±Ø¨ÙØ§ Ø§Ø³ØªØ®Ø¯ÙØª Ø®ÙØ§Ø± toram Ø
+msgstr Ø§ÙØ¬ÙØ§Ø² Ø§ÙØ°Ù ÙØ¹ÙÙ ØªÙÙØ² ÙÙ Ø¹ÙÙÙ ØºÙØ± Ù
ÙØ¬ÙØ¯. Ø±Ø¨ÙØ§ Ø§Ø³ØªØ®Ø¯ÙØª Ø®ÙØ§Ø± 'ØªÙØ±Ø§Ù' Ø

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

[tor-commits] [tor-browser-bundle/maint-3.6] Bug 12381: Add the real fte 0.2.17 commit.

2014-07-22 Thread gk

commit 5c33ddd0275065a04d099c86676ffed675732e86
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 20:15:34 2014 +

Bug 12381: Add the real fte 0.2.17 commit.
---
 gitian/versions |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions b/gitian/versions
index c0e5047..6f3c7eb 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3
-FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17
+FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 

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

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

2014-07-22 Thread translation

commit 6cae45b737ff228b9838c10bd95c6ab9faab036d
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 18:45:47 2014 +

Update translations for tails-perl5lib
---
 ar.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar.po b/ar.po
index 4eebf87..684da44 100644
--- a/ar.po
+++ b/ar.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2014-06-24 11:37+0200\n
-PO-Revision-Date: 2014-07-22 18:12+\n
+PO-Revision-Date: 2014-07-22 18:21+\n
 Last-Translator: Karimation karim.1...@live.com\n
 Language-Team: Arabic 
(http://www.transifex.com/projects/p/torproject/language/ar/)\n
 MIME-Version: 1.0\n

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

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

2014-07-22 Thread translation

commit 1f2d5db98b3b1b12238cd86ff7e9e8b1d76ae2f2
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 18:45:49 2014 +

Update translations for tails-perl5lib_completed
---
 ar.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar.po b/ar.po
index 4eebf87..684da44 100644
--- a/ar.po
+++ b/ar.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2014-06-24 11:37+0200\n
-PO-Revision-Date: 2014-07-22 18:12+\n
+PO-Revision-Date: 2014-07-22 18:21+\n
 Last-Translator: Karimation karim.1...@live.com\n
 Language-Team: Arabic 
(http://www.transifex.com/projects/p/torproject/language/ar/)\n
 MIME-Version: 1.0\n

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

[tor-commits] [tor-browser-bundle/maint-3.6] NoScript and HTTPS-E version bump.

2014-07-22 Thread gk

commit bb3eab34bbecba26af4f2112a7140ed656b72e8f
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 20:52:30 2014 +

NoScript and HTTPS-E version bump.
---
 gitian/versions |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 6f3c7eb..e11d9f1 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1
 TOR_TAG=tor-0.2.4.22
 TORLAUNCHER_TAG=0.2.5.5
 TORBUTTON_TAG=1.6.10.0
-HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630
+HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
@@ -41,12 +41,12 @@ PY2EXE_VER=0.6.9
 SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
 PARSLEY_VER=1.2
-HTTPSE_VER=3.5.1
+HTTPSE_VER=3.5.3
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.28-fx+sm+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
@@ -74,8 +74,8 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275
-HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29
+NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189
+HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10
 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

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

[tor-commits] [tor-browser-bundle/master] Bump NoScript version in alpha and nightly target.

2014-07-22 Thread gk

commit 4d0a5bbeb4f6cf20120953e6896eada48cbb6dd4
Author: Georg Koppen g...@torproject.org
Date:   Tue Jul 22 21:05:39 2014 +

Bump NoScript version in alpha and nightly target.
---
 gitian/versions.alpha   |4 ++--
 gitian/versions.nightly |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 1b1d7d7..2d7273d 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -49,7 +49,7 @@ GO_VER=1.3
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
@@ -77,7 +77,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334
+NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189
 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 59c55dc..f61f5e8 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -49,7 +49,7 @@ GO_VER=1.3
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.31-fn+sm+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.xpi
 HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
@@ -77,7 +77,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=1b624e8425673bfc092f8333e0e9642744d6bbe4499d8d907107e49032dbc334
+NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189
 HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

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

[tor-commits] [tor-browser-bundle/master] Check kvm group membership prerequisite.

2014-07-22 Thread mikeperry

commit f3bb332309c205ac8b1dfd954ec7f2ccb4033f0a
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 22 12:43:20 2014 -0700

Check kvm group membership prerequisite.

If the user is not at the X11 console, then they must be in the kvm group to
access /dev/kvm.
---
 gitian/check-prerequisites.sh |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index e470b84..62167e9 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -49,7 +49,7 @@ then
 fi
 
 if [ z$USE_LXC != z1 ];
-then 
+then
   groups | grep libvirtd  /dev/null
   if [ $? -ne 0 ];
   then
@@ -60,6 +60,19 @@ then
 echo  newgrp libvirtd
 exit 1
   fi
+  if [ -z $DISPLAY ];
+  then
+groups | grep kvm  /dev/null
+if [ $? -ne 0 ];
+then
+  echo You need to be in the kvm group to run Gitian on a headless 
server.
+  echo
+  echo Please run:
+  echo  sudo adduser $USER kvm
+  echo  newgrp kvm
+  exit 1
+fi
+  fi
 fi
 
 

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

[tor-commits] r26886: {website} update mirror status. (website/trunk/include)

2014-07-22 Thread Andrew Lewman

Author: phobos
Date: 2014-07-22 21:20:31 + (Tue, 22 Jul 2014)
New Revision: 26886

Modified:
   website/trunk/include/mirrors-table.wmi
   website/trunk/include/tor-mirrors.csv
Log:
update mirror status.


Modified: website/trunk/include/mirrors-table.wmi
===
--- website/trunk/include/mirrors-table.wmi 2014-07-22 18:08:17 UTC (rev 
26885)
+++ website/trunk/include/mirrors-table.wmi 2014-07-22 21:20:31 UTC (rev 
26886)
@@ -52,23 +52,6 @@
  
 tr
 
- tdNL/td
-
- tdBBLN/td
-
- tdUp to date/td
-
-td - /td
-tda href=http://mirror.ml/tor/dist/;http/a/td
-tda href=http://mirror.ml/tor/;http/a/td
-tda href=https://mirror.ml/tor/dist/;https/a/td
-tda href=https://mirror.ml/tor/;https/a/td
-td - /td
-td - /td
-/tr
- 
-tr
-
  tdUS/td
 
  tdTor Supporter/td
@@ -341,6 +324,23 @@
  
 tr
 
+ tdIN/td
+
+ tdIndia Tor Fans/td
+
+ tdUp to date/td
+
+td - /td
+tda href=http://www.torproject.org.in/dist/;http/a/td
+tda href=http://www.torproject.org.in/;http/a/td
+td - /td
+td - /td
+td - /td
+td - /td
+/tr
+ 
+tr
+
  tdFR/td
 
  tdTor Supporter/td
@@ -375,6 +375,23 @@
  
 tr
 
+ tdNL/td
+
+ tdAmorphis/td
+
+ tdUp to date/td
+
+td - /td
+tda href=http://tor.amorphis.eu/dist/;http/a/td
+tda href=http://tor.amorphis.eu/;http/a/td
+td - /td
+td - /td
+td - /td
+td - /td
+/tr
+ 
+tr
+
  tdUS/td
 
  tdHackThisSite.org/td

Modified: website/trunk/include/tor-mirrors.csv
===
--- website/trunk/include/tor-mirrors.csv   2014-07-22 18:08:17 UTC (rev 
26885)
+++ website/trunk/include/tor-mirrors.csv   2014-07-22 21:20:31 UTC (rev 
26886)
@@ -1,107 +1,107 @@
 adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, 
httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, 
httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, 
updateDate
 Tor Fan, Tor Supporter, US, United States, US, TRUE, TRUE, No, 
http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , 
-info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, 
Europe, TRUE, FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , 
, , Sat Jul 19 23:55:06 2014
-http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, 
http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sat Jul 19 
23:55:06 2014
-haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, 
http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Sat Jul 19 
23:55:06 2014
-Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, 
http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Sat Jul 19 
23:55:06 2014
-margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, 
http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Sat 
Jul 19 23:55:06 2014
-Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, 
http://torproject.is/, , , , http://torproject.is/dist/, , , , Sat Jul 19 
23:55:06 2014
-Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, 
https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, 
ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, 
https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , 
Sat Jul 19 23:55:06 2014
-Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , 
http://tor.me0w.cc/dist/, , , , Sat Jul 19 23:55:06 2014
-Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, 
http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Sat Jul 19 
23:55:06 2014
+info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, 
Europe, TRUE, FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , 
, , Sun Jul 20 23:16:25 2014
+http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, 
http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sun Jul 20 
23:16:25 2014
+haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, 
http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Sun Jul 20 
23:16:25 2014
+Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, 
http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Sun Jul 20 
23:16:25 2014
+margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, 
http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Sun 
Jul 20 23:16:25 2014
+Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, 
http://torproject.is/, , , , http://torproject.is/dist/, , , , Sun Jul 20 
23:16:25 2014
+Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/,

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

2014-07-22 Thread translation

commit cd11c279eda7fd4e70ef6f56575626ac65d64ffd
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:15:05 2014 +

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

diff --git a/sk_SK/gettor.po b/sk_SK/gettor.po
index 35bc5f9..6c307d7 100644
--- a/sk_SK/gettor.po
+++ b/sk_SK/gettor.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2014-07-22 21:43+\n
+PO-Revision-Date: 2014-07-22 21:50+\n
 Last-Translator: once matejba...@gmail.com\n
 Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n
 MIME-Version: 1.0\n
@@ -259,7 +259,7 @@ msgstr Premostenie mÃ´Å¾ete zÃskaÅ¥ zaslanÃm e-mailu, 
ktorÃ½ v tele sprÃ¡vy o
 msgid 
 It is also possible to fetch bridges with a web browser at the following\n
 url: https://bridges.torproject.org/;
-msgstr 
+msgstr Premostenia si tieÅ¾ mÃ´Å¾ete stiahnuÅ¥ pomocou webovÃ©ho 
prehliadaÄa\nna nasledujÃºcej adrese: https://bridges.torproject.org/;
 
 #: lib/gettor/i18n.py:175
 msgid 

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

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

2014-07-22 Thread translation

commit 9ccbc1fd3366dcb19b665f2e54324172a6f802d2
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:15:32 2014 +

Update translations for mat-gui
---
 is.po |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/is.po b/is.po
index 5284ec7..168eb87 100644
--- a/is.po
+++ b/is.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-01-19 14:48+\n
-PO-Revision-Date: 2014-03-13 08:00+\n
+PO-Revision-Date: 2014-07-22 22:11+\n
 Last-Translator: Sveinn Ã Felli s...@fellsnet.is\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n
@@ -21,19 +21,19 @@ msgstr 
 
 #: mat-gui:61 mat-gui:403 mat-gui:422
 msgid Ready
-msgstr 
+msgstr TilbÃºiÃ°
 
 #: mat-gui:128
 msgid Choose files
-msgstr 
+msgstr Veldu skrÃ¡r
 
 #: mat-gui:135
 msgid All files
-msgstr 
+msgstr Allar skrÃ¡r
 
 #: mat-gui:142
 msgid Supported files
-msgstr 
+msgstr Studdar skrÃ¡r
 
 #: mat-gui:157
 msgid No metadata found
@@ -58,11 +58,11 @@ msgstr 
 
 #: mat-gui:181
 msgid Website
-msgstr 
+msgstr VefsvÃ¦Ã°i
 
 #: mat-gui:207 data/mat.ui:107
 msgid Preferences
-msgstr 
+msgstr KjÃ¶rstillingar
 
 #: mat-gui:220
 msgid Reduce PDF quality
@@ -102,11 +102,11 @@ msgstr 
 
 #: mat-gui:334 mat-gui:363 data/mat.ui:292
 msgid Filename
-msgstr SkrÃ¡arnafn
+msgstr SkrÃ¡arheiti
 
 #: mat-gui:336
 msgid Reason
-msgstr 
+msgstr ÃstÃ¦Ã°a
 
 #: mat-gui:348
 msgid Non-supported files in archive
@@ -137,15 +137,15 @@ msgstr 
 
 #: data/mat.ui:63
 msgid _File
-msgstr 
+msgstr _SkrÃ¡
 
 #: data/mat.ui:99
 msgid _Edit
-msgstr 
+msgstr Br_eyta
 
 #: data/mat.ui:118 data/mat.ui:253
 msgid Clear
-msgstr 
+msgstr Hreinsa
 
 #: data/mat.ui:134
 msgid _Process
@@ -157,7 +157,7 @@ msgstr 
 
 #: data/mat.ui:214
 msgid Add
-msgstr 
+msgstr BÃ¦ta viÃ°
 
 #: data/mat.ui:240
 msgid Check

___
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

2014-07-22 Thread translation

commit c16d72192e41a737f35c9417007cb7ccc04f725f
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:45:03 2014 +

Update translations for bridgedb
---
 is/LC_MESSAGES/bridgedb.po |  124 ++--
 1 file changed, 74 insertions(+), 50 deletions(-)

diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 5fcd85e..08555d2 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
-POT-Creation-Date: 2014-05-16 18:39+\n
+POT-Creation-Date: 2014-06-06 21:46+\n
 PO-Revision-Date: 2011-02-19 16:53+\n
 Last-Translator: Isis Lovecruft i...@torproject.org\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
@@ -20,19 +20,16 @@ msgstr 
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. bridge
-#. bridges
 #. BridgeDB
 #. pluggable transport
 #. pluggable transports
 #. obfs2
 #. obfs3
 #. scramblesuit
-#. fte
+#. fteproxy
 #. Tor
 #. Tor Browser
-#. TBB
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid Sorry! Something went wrong with your request.
 msgstr 
 
@@ -56,39 +53,44 @@ msgid 
 COMMANDs: (combine COMMANDs to specify multiple options simultaneously)
 msgstr 
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word BridgeDB.
+#: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
 msgstr 
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid Currently supported transport TYPEs:
 msgstr 
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid Hey, %s!
 msgstr 
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid Hello, friend!
 msgstr 
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
 msgid Public Keys
 msgstr 
 
 #. TRANSLATORS: This string will end up saying something like:
 #. This email was generated with rainbows, unicorns, and sparkles
 #. for al...@example.com on Friday, 09 May, 2014 at 18:59:39.
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
 #, python-format
 msgid 
 This email was generated with rainbows, unicorns, and sparkles\n
 for %s on %s at %s.
 msgstr 
 
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate BridgeDB.
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#. TRANSLATORS: Please DO NOT translate Tor.
+#. TRANSLATORS: Please DO NOT translate Tor Network.
+#: lib/bridgedb/strings.py:47
 #, python-format
 msgid 
 BridgeDB can provide bridges with several %stypes of Pluggable 
Transports%s,\n
@@ -98,14 +100,20 @@ msgid 
 \n
 msgstr 
 
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#: lib/bridgedb/strings.py:54
 msgid 
 Some bridges with IPv6 addresses are also available, though some Pluggable\n
 Transports aren't IPv6 compatible.\n
 \n
 msgstr 
 
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate BridgeDB.
+#. TRANSLATORS: The phrase plain-ol'-vanilla means plain, boring,
+#. regular, or unexciting. Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
 #, python-format
 msgid 
 Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without 
any\n
@@ -114,20 +122,20 @@ msgid 
 \n
 msgstr 
 
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
 msgid What are bridges?
 msgstr 
 
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
 #, python-format
 msgid %s Bridges %s are Tor relays that help you circumvent censorship.
 msgstr 
 
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
 msgid I need an alternative way of getting bridges!
 msgstr 
 
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
 #, python-format
 msgid 
 Another way to get bridges is to send an email to %s. Please note that you 
must\n
@@ -135,75 +143,83 @@ msgid 
 %s or %s.
 msgstr 
 
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
 msgid My bridges don't work! I need help!
 msgstr 
 
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate Tor.
+#: lib/bridgedb/strings.py:92
 #, python-format
 msgid If your Tor doesn't work, you should email %s.
 msgstr 
 
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate Pluggable Transports.
+#. TRANSLATORS: Please DO NOT translate Tor Browser.
+#.

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

2014-07-22 Thread translation

commit 09e7b0463b6919bb2fe7b086b7c8176fb713d118
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:45:17 2014 +

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

diff --git a/is/ssl-observatory.dtd b/is/ssl-observatory.dtd
index 84184d7..7e326d3 100644
--- a/is/ssl-observatory.dtd
+++ b/is/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 !-- Observatory popup window --
 !ENTITY ssl-observatory.popup.details Details and Privacy Information
 !ENTITY ssl-observatory.popup.later Ask Me Later
-!ENTITY ssl-observatory.popup.no No
+!ENTITY ssl-observatory.popup.no Nei
 
 !ENTITY ssl-observatory.popup.text HTTPS Everywhere can detect attacks
 against your browser by sending the certificates you receive to the
@@ -15,7 +15,7 @@ to turn it on?--
 !ENTITY ssl-observatory.popup.title 
 Should HTTPS Everywhere use the SSL Observatory?
 
-!ENTITY ssl-observatory.popup.yes Yes
+!ENTITY ssl-observatory.popup.yes JÃ¡
 
 !-- Observatory preferences dialog --
 

___
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

2014-07-22 Thread translation

commit 6193d87c3be77da898cfbc32cf0769f33d19ad56
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:45:41 2014 +

Update translations for tor-launcher-network-settings
---
 is/network-settings.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/is/network-settings.dtd b/is/network-settings.dtd
index a346274..4ae3e5e 100644
--- a/is/network-settings.dtd
+++ b/is/network-settings.dtd
@@ -4,8 +4,8 @@
 
 !ENTITY torsettings.prompt Before you connect to the Tor network, you need 
to provide information about this computer's Internet connection.
 
-!ENTITY torSettings.yes Yes
-!ENTITY torSettings.no No
+!ENTITY torSettings.yes JÃ¡
+!ENTITY torSettings.no Nei
 
 !ENTITY torSettings.firstQuestion Which of the following best describes your 
situation?
 !ENTITY torSettings.configurePrompt1 This computer's Internet connection is 
censored, filtered, or proxied.

___
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

2014-07-22 Thread translation

commit 98feda9ab5ad266453cfd1506ad1ab31a2a92964
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:45:34 2014 +

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

diff --git a/is.po b/is.po
index 168eb87..9ab7bf2 100644
--- a/is.po
+++ b/is.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-01-19 14:48+\n
-PO-Revision-Date: 2014-07-22 22:11+\n
+PO-Revision-Date: 2014-07-22 22:20+\n
 Last-Translator: Sveinn Ã Felli s...@fellsnet.is\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n

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

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

2014-07-22 Thread translation

commit 8e6a2cc4efdd4148d7918827579796d806106a80
Author: Translation commit bot translat...@torproject.org
Date:   Tue Jul 22 22:45:27 2014 +

Update translations for tails-greeter
---
 is/is.po |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/is/is.po b/is/is.po
index 0bc0224..8683412 100644
--- a/is/is.po
+++ b/is/is.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sveinn Ã Felli s...@fellsnet.is, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2014-05-28 22:33+0200\n
-PO-Revision-Date: 2014-05-29 08:53+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-07-20 18:36+0200\n
+PO-Revision-Date: 2014-07-22 22:30+\n
+Last-Translator: Sveinn Ã Felli s...@fellsnet.is\n
 Language-Team: Icelandic 
(http://www.transifex.com/projects/p/torproject/language/is/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -23,7 +24,7 @@ msgstr Ãfram
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid Login
-msgstr 
+msgstr InnskrÃ¡ning
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid Welcome to Tails
@@ -39,11 +40,11 @@ msgstr 
 
 #: ../glade/persistencewindow.glade.h:6
 msgid Yes
-msgstr 
+msgstr JÃ¡
 
 #: ../glade/persistencewindow.glade.h:7
 msgid No
-msgstr 
+msgstr Nei
 
 #: ../glade/persistencewindow.glade.h:8
 msgid Passphrase:
@@ -196,7 +197,7 @@ msgid 
 %(stderr)s
 msgstr 
 
-#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152
-#: ../tailsgreeter/langpanel.py:185
+#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150
+#: ../tailsgreeter/langpanel.py:183
 msgid Other...
 msgstr 

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

[tor-commits] [bridgedb/develop] Fix an additional utf-8 encoding error for optional email headers.

2014-07-22 Thread isis

commit 48bb5fd6b1bf2a8e63e1dbd2b6f15b1945cf0402
Author: Isis Lovecruft i...@torproject.org
Date:   Sat Jul 19 03:33:05 2014 +

Fix an additional utf-8 encoding error for optional email headers.
---
 lib/bridgedb/email/autoresponder.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/email/autoresponder.py 
b/lib/bridgedb/email/autoresponder.py
index e7dcdf2..7e5f900 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -323,7 +323,8 @@ class EmailResponse(object):
 headerName = headerName.capitalize()
 headerName = headerName.replace(' ', '-')
 headerName = headerName.replace('_', '-')
-self.write(%s: %s % (headerName, headerValue))
+header = %s: %s % (headerName, headerValue)
+self.write(header.encode('utf-8'))
 
 # The first blank line designates that the headers have ended:
 self.write(self.delimiter)



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

[tor-commits] [bridgedb/develop] Merge branch 'fix/12627-hotfixes' into develop

2014-07-22 Thread isis

commit f8907b32eade1ecf8c40983c664c5e7c4ac2e427
Merge: 91142d6 4224107
Author: Isis Lovecruft i...@torproject.org
Date:   Tue Jul 22 22:43:58 2014 +

Merge branch 'fix/12627-hotfixes' into develop

 lib/bridgedb/email/autoresponder.py |   35 ++-
 lib/bridgedb/email/server.py|2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

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

[tor-commits] [bridgedb/develop] Fix utf-8 encoding errors in email.autoresponder module.

2014-07-22 Thread isis

commit 29bdc8754503a2e1ead7c39b5b1207215926eee8
Author: Matthew Finkel sys...@torproject.org
Date:   Sat Jul 19 03:29:53 2014 +

Fix utf-8 encoding errors in email.autoresponder module.

 * FIXES several write errors due to encoding issues on production
   server.

Signed-off-by: Isis Lovecruft i...@torproject.org
These were part of the hotfixes to ponticum on 2014-07-16.
---
 lib/bridgedb/email/autoresponder.py |   18 +-
 lib/bridgedb/email/server.py|2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/bridgedb/email/autoresponder.py 
b/lib/bridgedb/email/autoresponder.py
index add1d6c..e7dcdf2 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -136,9 +136,9 @@ def generateResponse(fromAddress, client, body, 
subject=None,
 
 response = EmailResponse(gpgContext)
 response.to = client
-response.writeHeaders(fromAddress, str(client), subject,
+response.writeHeaders(fromAddress.encode('utf-8'), str(client), subject,
   inReplyTo=messageID)
-response.writeBody(body)
+response.writeBody(body.encode('utf-8'))
 
 # Only log the email text (including all headers) if SAFE_LOGGING is
 # disabled:
@@ -221,9 +221,9 @@ class EmailResponse(object):
  self.__class__.__name__))
 try:
 if size is not None:
-contents = self.mailfile.read(int(size))
+contents = self.mailfile.read(int(size)).encode('utf-8')
 else:
-contents = self.mailfile.read()
+contents = self.mailfile.read().encode('utf-8')
 except Exception as error:  # pragma: no cover
 logging.exception(error)
 
@@ -306,17 +306,17 @@ class EmailResponse(object):
 self.write(From: %s % fromAddress)
 self.write(To: %s % toAddress)
 if includeMessageID:
-self.write(Message-ID: %s % smtp.messageid())
+self.write(Message-ID: %s % smtp.messageid().encode('utf-8'))
 if inReplyTo:
-self.write(In-Reply-To: %s % inReplyTo)
-self.write(Content-Type: %s % contentType)
-self.write(Date: %s % smtp.rfc822date())
+self.write(In-Reply-To: %s % inReplyTo.encode('utf-8'))
+self.write(Content-Type: %s % contentType.encode('utf-8'))
+self.write(Date: %s % smtp.rfc822date().encode('utf-8'))
 
 if not subject:
 subject = '[no subject]'
 if not subject.lower().startswith('re'):
 subject = Re:  + subject
-self.write(Subject: %s % subject)
+self.write(Subject: %s % subject.encode('utf-8'))
 
 if kwargs:
 for headerName, headerValue in kwargs.items():
diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py
index 1717958..4bcfed9 100644
--- a/lib/bridgedb/email/server.py
+++ b/lib/bridgedb/email/server.py
@@ -176,7 +176,7 @@ class SMTPMessage(object):
 self.lines.append(line)
 if not safelog.safe_logging:
 try:
-logging.debug( %s, line.rstrip(\r\n))
+logging.debug( %s, line.rstrip(\r\n).encode('utf-8'))
 except UnicodeError:  # pragma: no cover
 pass
 except Exception as error:  # pragma: no cover



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

[tor-commits] [bridgedb/develop] Use intervalStart() in b.e.autoresponder.createResponseBody().

2014-07-22 Thread isis

commit 2ba3f7f912fdc45038741d1e1a1f4759ffe3ce52
Author: Matthew Finkel sys...@torproject.org
Date:   Sat Jul 19 03:14:04 2014 +

Use intervalStart() in b.e.autoresponder.createResponseBody().

 * CHANGE `bridgedb.email.autoresponder.getResponseBody()` to use
   `bridgedb.schedule.intervalStart()`, not `getInterval()`.

Signed-off-by: Isis Lovecruft i...@torproject.org
These were part of the hotfixes to ponticum on 2014-07-16.
---
 lib/bridgedb/email/autoresponder.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bridgedb/email/autoresponder.py 
b/lib/bridgedb/email/autoresponder.py
index 240818a..add1d6c 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -75,7 +75,7 @@ def createResponseBody(lines, context, client, lang='en'):
  % str(client))
 
 # Otherwise they must have requested bridges:
-interval = context.schedule.getInterval(time.time())
+interval = context.schedule.intervalStart(time.time())
 bridges = context.distributor.getBridgesForEmail(
 str(client),
 interval,



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

[tor-commits] [bridgedb/develop] Revert check for SMTP/email header canonical hostname equivalence.

2014-07-22 Thread isis

commit 422410756a7752d6af5b881776fb107fd5e6335e
Author: Matthew Finkel sys...@torproject.org
Date:   Sat Jul 19 03:33:56 2014 +

Revert check for SMTP/email header canonical hostname equivalence.

Signed-off-by: Isis Lovecruft i...@torproject.org

For now, we need to revert this check to get the email distributor to
function. We should look into this issue in order to get BridgeDB in a
state where instances of it are runnable by other organisations to hand
out their own bridges. [OTHER_ORG]

Fixing this is essential for #12086.
---
 lib/bridgedb/email/autoresponder.py |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/bridgedb/email/autoresponder.py 
b/lib/bridgedb/email/autoresponder.py
index 7e5f900..3674702 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -631,12 +631,12 @@ class SMTPAutoresponder(smtp.SMTPClient):
 
 # The canonical domains from the SMTP ``MAIL FROM:`` and the email
 # ``From:`` header should match:
-if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail:
-logging.error(SMTP/Email canonical domain mismatch!)
-logging.debug(Canonical domain mismatch: %s != %s
-  % (self.incoming.canonicalFromSMTP,
- self.incoming.canonicalFromEmail))
-return False
+#if self.incoming.canonicalFromSMTP != 
self.incoming.canonicalFromEmail:
+#logging.error(SMTP/Email canonical domain mismatch!)
+#logging.debug(Canonical domain mismatch: %s != %s
+#  % (self.incoming.canonicalFromSMTP,
+# self.incoming.canonicalFromEmail))
+#return False
 
 self.incoming.domainRules = self.incoming.context.domainRules.get(
 self.incoming.canonicalFromEmail, list())



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

[tor-commits] [tor-browser-bundle/maint-3.6] Switch FTE bridges to IP-only+separate IPv6 bridges.

2014-07-22 Thread mikeperry

commit ecd19a6a88058dedb1726747eb4184a959d5af6b
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 22 20:47:02 2014 -0700

Switch FTE bridges to IP-only+separate IPv6 bridges.
---
 Bundle-Data/PTConfigs/bridge_prefs.js |   21 -
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 9cb8a6a..5315a32 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -17,21 +17,16 @@ pref(extensions.torlauncher.default_bridge.flashproxy.4, 
flashproxy 0.0.1.0:4
 pref(extensions.torlauncher.default_bridge.flashproxy.5, flashproxy 
0.0.1.0:5);
 
 // ipv4
-pref(extensions.torlauncher.default_bridge.fte.1, fte 
t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
-pref(extensions.torlauncher.default_bridge.fte.2, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
-pref(extensions.torlauncher.default_bridge.fte.3, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.4, fte 
server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.6, fte 
server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.7, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.8, fte 
server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.9, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.10, fte 
server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.11, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
-pref(extensions.torlauncher.default_bridge.fte.12, fte 
server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09);
+pref(extensions.torlauncher.default_bridge.fte.1, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.2, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.4, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.6, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
 // /ipv4
 // ipv6
-pref(extensions.torlauncher.default_bridge.fte.13, fte 
ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte-ipv6.1, fte 
2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte-ipv6.2, fte 
2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
 // /ipv6
 
 //pref(extensions.torlauncher.default_bridge.scramblesuit.1, scramblesuit 
188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C 
password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI);



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

[tor-commits] [tor-browser-bundle/master] Switch FTE bridges to IP-only+separate IPv6 bridges.

2014-07-22 Thread mikeperry

commit ece1766b18f94b7937ac2497d7e3fb4b5fd62965
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jul 22 20:53:25 2014 -0700

Switch FTE bridges to IP-only+separate IPv6 bridges.
---
 Bundle-Data/PTConfigs/bridge_prefs.js |   21 -
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 6ee714d..5abe0cc 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -17,21 +17,16 @@ pref(extensions.torlauncher.default_bridge.flashproxy.4, 
flashproxy 0.0.1.0:4
 pref(extensions.torlauncher.default_bridge.flashproxy.5, flashproxy 
0.0.1.0:5);
 
 // ipv4
-pref(extensions.torlauncher.default_bridge.fte.1, fte 
t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
-pref(extensions.torlauncher.default_bridge.fte.2, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
-pref(extensions.torlauncher.default_bridge.fte.3, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.4, fte 
server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
-pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.6, fte 
server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
-pref(extensions.torlauncher.default_bridge.fte.7, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.8, fte 
server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D);
-pref(extensions.torlauncher.default_bridge.fte.9, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.10, fte 
server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
-pref(extensions.torlauncher.default_bridge.fte.11, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
-pref(extensions.torlauncher.default_bridge.fte.12, fte 
server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09);
+pref(extensions.torlauncher.default_bridge.fte.1, fte 54.244.94.118:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte.2, fte 131.252.210.150:8080 
0E858AC201BF0F3FA3C462F64844CBFFC7297A42);
+pref(extensions.torlauncher.default_bridge.fte.3, fte 128.105.214.161:8080 
1E326AAFB3FCB515015250D8FCCC8E37F91A153B);
+pref(extensions.torlauncher.default_bridge.fte.4, fte 128.105.214.162:8080 
FC562097E1951DCC41B7D7F324D88157119BB56D);
+pref(extensions.torlauncher.default_bridge.fte.5, fte 128.105.214.163:8080 
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9);
+pref(extensions.torlauncher.default_bridge.fte.6, fte 79.125.3.12:8080 
272465348803EE2546A9BB8EE37D462915531F09);
 // /ipv4
 // ipv6
-pref(extensions.torlauncher.default_bridge.fte.13, fte 
ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte-ipv6.1, fte 
2620:108:700f::36f5:f95b:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
+pref(extensions.torlauncher.default_bridge.fte-ipv6.2, fte 
2620:108:700f::36d6:163f:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89);
 // /ipv6
 
 pref(extensions.torlauncher.default_bridge.scramblesuit.1, scramblesuit 
188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C 
password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI);

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

46 matches

Mail list logo