date:20130824

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

2013-08-24 Thread translation

commit 0631b3e865dc1cb299a2b561c648a8be331798aa
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 08:16:13 2013 +

Update translations for orbot
---
 values/strings.xml |1 +
 1 file changed, 1 insertion(+)

diff --git a/values/strings.xml b/values/strings.xml
index fa9eedd..ea899fe 100644
--- a/values/strings.xml
+++ b/values/strings.xml
@@ -231,4 +231,5 @@
   string name=upup/string
   string name=pref_disable_network_titleNetwork Auto-Sleep/string
   string name=pref_disable_network_summaryPut Tor to sleep when there is 
no network connectivity/string
+  string name=newnymYou\'ve switched to a new Tor identity!/string
 /resources

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

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

2013-08-24 Thread translation

commit 78cc9ca9d4380575d36610e71c49f936a52e052c
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 08:16:19 2013 +

Update translations for orbot_completed
---
 values/strings.xml |1 +
 1 file changed, 1 insertion(+)

diff --git a/values/strings.xml b/values/strings.xml
index fa9eedd..ea899fe 100644
--- a/values/strings.xml
+++ b/values/strings.xml
@@ -231,4 +231,5 @@
   string name=upup/string
   string name=pref_disable_network_titleNetwork Auto-Sleep/string
   string name=pref_disable_network_summaryPut Tor to sleep when there is 
no network connectivity/string
+  string name=newnymYou\'ve switched to a new Tor identity!/string
 /resources

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

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

2013-08-24 Thread translation

commit cef67d2c3df7c33a43263db18ed5a09d251a6ccb
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 10:46:37 2013 +

Update translations for tails-misc
---
 ar.po |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ar.po b/ar.po
index 23029b7..c1aa777 100644
--- a/ar.po
+++ b/ar.po
@@ -12,8 +12,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 14:06+0200\n
-PO-Revision-Date: 2013-08-14 23:50+\n
-Last-Translator: Sherief Alaa sheriefala...@gmail.com\n
+PO-Revision-Date: 2013-08-24 10:46+\n
+Last-Translator: Mohammed ALDOUB voul...@gmail.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
@@ -53,23 +53,23 @@ msgstr Ø¹Ù
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:192
 msgid Encrypt Clipboard with _Passphrase
-msgstr 
+msgstr Ø´ÙØ± Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ© Ø¨Ø§ÙØ¹Ø¨Ø§Ø±Ø© 
Ø§ÙØ³Ø±ÙØ©
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:195
 msgid Sign/Encrypt Clipboard with Public _Keys
-msgstr 
+msgstr Ø´ÙØ±/ÙÙØ¹ Ø§ÙÙØªØ±ÙÙÙØ§ Ø¹ÙÙ Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙ
Ø¤ÙØªØ© Ø¨Ø§ÙÙÙØªØ§Ø Ø§ÙØ¹Ø§Ù
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:200
 msgid _Decrypt/Verify Clipboard
-msgstr 
+msgstr Ø§ÙØªØ ØªØ´ÙÙØ±/ØªØÙÙ ÙÙ Ø§ÙØªÙÙÙØ¹ Ø§ÙØ§ÙÙØªØ±ÙÙÙ 
Ø¹ÙÙ Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ©
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:204
 msgid _Manage Keys
-msgstr 
+msgstr Ø¥Ø¯Ø§Ø±Ø© Ø§ÙÙÙØ§ØªÙØ
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:244
 msgid The clipboard does not contain valid input data.
-msgstr 
+msgstr Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ© ÙØ§ ØªØØªÙÙ ÙØ¯Ø®ÙØ§Øª 
Ø³ÙÙÙØ©.
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:294
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296
@@ -95,7 +95,7 @@ msgstr Ø§ÙØ§Ø³Ù
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:358
 msgid Key ID
-msgstr 
+msgstr ÙÙÙØ© Ø§ÙÙÙØªØ§Ø
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:359
 msgid Status
@@ -103,7 +103,7 @@ msgstr Ø§ÙØØ§ÙØ©
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:391
 msgid Fingerprint:
-msgstr 
+msgstr Ø¨ØµÙØ© Ø§ÙÙÙØªØ§Ø:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:394
 msgid User ID:
@@ -117,11 +117,11 @@ msgstr[5] 
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:424
 msgid None (Don't sign)
-msgstr 
+msgstr Ø¯ÙÙ Ø§Ø®ØªÙØ§Ø± (ÙØ§ ØªÙÙØ¹ Ø§ÙÙØªØ±ÙÙÙØ§)
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:487
 msgid Select recipients:
-msgstr 
+msgstr Ø§Ø®ØªØ± Ø§ÙÙØ³ØªÙÙÙÙ:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:495
 msgid Hide recipients
@@ -131,11 +131,11 @@ msgstr Ø¥Ø®ÙØ§Ø¡ Ø§ÙÙØ³ØªÙÙÙÙ
 msgid 
 Hide the user IDs of all recipients of an encrypted message. Otherwise 
 anyone that sees the encrypted message can see who the recipients are.
-msgstr 
+msgstr Ø§Ø®ÙÙ ÙÙÙØ§Øª Ø§ÙÙØ³ØªÙÙÙÙ ÙÙÙ Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙ
Ø´ÙØ±Ø©. Ø§Ø°Ø§ ÙÙ ØªÙÙ Ø¨ÙØ°Ø§ ÙØ³ÙØ³ØªØ·ÙØ¹ ÙÙ ÙÙ ÙØ´Ø§ÙØ¯ 
Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙØ´ÙØ±Ø© Ø£Ù ÙØ¹Ø±Ù ÙÙ Ø£Ø±Ø³ÙØª ÙÙ.
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:504
 msgid Sign message as:
-msgstr 
+msgstr ÙÙØ¹ Ø§ÙØ±Ø³Ø§ÙØ© Ø§ÙÙØªØ±ÙÙÙØ§ Ø¨ØµÙØ©:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:508
 msgid Choose keys
@@ -173,7 +173,7 @@ msgstr ÙØ§ ÙÙØ¬Ø¯ ÙÙØ§ØªÙØ ÙØØ¯Ø¯Ø©
 msgid 
 You must select a private key to sign the message, or some public keys to 
 encrypt the message, or both.
-msgstr 
+msgstr ÙØ¬Ø¨ Ø¹ÙÙÙ Ø§Ø®ØªÙØ§Ø± ÙÙØªØ§Ø ØªØ´ÙÙØ± Ø®Ø§Øµ ÙØªÙÙÙØ¹ 
Ø§ÙØ±Ø³Ø§ÙØ© Ø§ÙÙØªØ±ÙÙÙØ§Ø Ø£Ù Ø¨Ø¹Ø¶ Ø§ÙÙÙØ§ØªÙØ Ø§ÙØ¹Ø§ÙØ© 
ÙØªØ´ÙÙØ± Ø§ÙØ±Ø³Ø§ÙØ©Ø Ø£Ù ÙÙØ§ÙÙØ§ ÙØ¹Ø§Ù:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:612
 msgid No keys available
@@ -182,7 +182,7 @@ msgstr ÙØ§ ÙÙØ¬Ø¯ ÙÙØ§ØªÙØ ÙØªØ§ØØ©
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:614
 msgid 
 You need a private key to sign messages or a public key to encrypt messages.
-msgstr 
+msgstr ØªØØªØ§Ø¬ ÙÙÙØªØ§Ø ØªØ´ÙÙØ± Ø®Ø§Øµ ÙØªÙÙÙØ¹ Ø§ÙØ±Ø³Ø§Ø¦Ù 
Ø§ÙÙØªØ±ÙÙÙØ§ÙØ Ø£Ù ÙÙØªØ§Ø ØªØ´ÙÙØ± Ø¹Ø§Ù ÙØªØ´ÙÙØ± 
Ø§ÙØ±Ø³Ø§Ø¦Ù.
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:742
 msgid GnuPG error
@@ -198,11 +198,11 @@ msgstr ÙØªØ§Ø¦Ø¬ GnuPG
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:819
 msgid Output of GnuPG:
-msgstr 
+msgstr ÙØ®Ø±Ø¬Ø§Øª GnuPG:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:844
 msgid Other messages provided by GnuPG:
-msgstr 
+msgstr Ø±Ø³Ø§Ø¦Ù Ø£Ø®Ø±Ù ÙÙ GnuPG:
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34
 msgid

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

2013-08-24 Thread translation

commit 702db14b4107e93004652b4fe93964ff4c2f
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:17 2013 +

Update translations for liveusb-creator_completed
---
 ar/ar.po |  201 +-
 1 file changed, 107 insertions(+), 94 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 2e2987f..44208ed 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -8,15 +8,15 @@
 # Fadi Mansour fadi.redeemer.mans...@gmail.com, 2012
 # alshara3 hsn.al...@gmail.com, 2013
 # Mohammed ALDOUB voul...@gmail.com, 2013
-# Sherief sheriefala...@gmail.com, 2013
+# Sherief Alaa sheriefala...@gmail.com, 2013
 # taljurf talj...@fedoraproject.org, 2009
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-02-14 16:07+0100\n
-PO-Revision-Date: 2013-05-13 21:30+\n
-Last-Translator: Sherief sheriefala...@gmail.com\n
+POT-Creation-Date: 2013-08-07 16:08+0200\n
+PO-Revision-Date: 2013-08-24 11:14+\n
+Last-Translator: Mohammed ALDOUB voul...@gmail.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
@@ -29,12 +29,12 @@ msgstr 
 msgid %(distribution)s LiveUSB Creator
 msgstr %(distribution)s Ø¥ÙØ´Ø§Ø¡ USB ØÙ
 
-#: ../liveusb/gui.py:758
+#: ../liveusb/gui.py:776
 #, python-format
 msgid %(filename)s selected
 msgstr ØªÙ ØªØØ¯ÙØ¯ %(filename)s
 
-#: ../liveusb/creator.py:1018
+#: ../liveusb/creator.py:1004
 #, python-format
 msgid %s already bootable
 msgstr %s Ø§ØµÙØ§Ù Ø¬Ø§ÙØ² ÙÙØ£ÙÙØ§Ø¹
@@ -91,16 +91,16 @@ msgid 
 persist after a reboot.
 msgstr Ø¥Ø°Ø§ Ø®ØµØµØª ÙØ³Ø§ØØ© Ø¥Ø¶Ø§ÙÙØ© ÙÙ ÙØ±Øµ Ø§ÙÙUSB 
ÙØªØµØ¨Ø ÙØ³Ø§ØØ© Ø¯Ø§Ø¦ÙØ©Ø Ø³ÙÙ ØªØ³ØªØ·ÙØ¹ Ø£Ù ØªØ®Ø²Ù 
Ø§ÙØ¨ÙØ§ÙØ§Øª Ù Ø§ÙÙÙØ§Ù Ø¨ØªØ¹Ø¯ÙÙØ§Øª Ø¯Ø§Ø¦ÙØ© Ø¹ÙÙ ÙØ¸Ø§Ù 
Ø§ÙØªØ´ØºÙÙ Ø§ÙØÙ. ÙÙ Ø¯ÙÙ Ø§ÙÙØ³Ø§ØØ© Ø§ÙØ¥Ø¶Ø§ÙÙØ© 
Ø§ÙØ¯Ø§Ø¦ÙØ© ÙÙ ØªØ³ØªØ·ÙØ¹ ØÙØ¸ Ø§ÙØ¨ÙØ§ÙØ§ØªØª Ù Ø³ØªÙÙØ¯ÙØ§ 
Ø¥Ø°Ø§ ØªÙ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙÙ Ø§ÙÙØ¸Ø§Ù.
 
-#: ../liveusb/creator.py:1120 ../liveusb/creator.py:1383
+#: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369
 #, python-format
 msgid Calculating the SHA1 of %s
 msgstr ÙØªÙ ØØ³Ø§Ø¨ SHA1 Ø§ÙØ®Ø§Øµ Ø¨Ù %s
 
-#: ../liveusb/creator.py:1331
+#: ../liveusb/creator.py:1317
 msgid Cannot find
 msgstr ÙØ§ ÙÙÙÙ Ø§ÙØ¹Ø«ÙØ±
 
-#: ../liveusb/creator.py:574
+#: ../liveusb/creator.py:545
 #, python-format
 msgid Cannot find device %s
 msgstr ÙØ§ ÙÙÙÙ Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ Ø§ÙØ¬ÙØ§Ø² %s
@@ -123,74 +123,73 @@ msgstr Ø§Ø³ØªÙØ³Ø®\nÙ\nØØ¯Ø«
 msgid Create Live USB
 msgstr Ø§ÙØ´Ø¦ ÙØ¸Ø§Ù ØªØ´ØºÙÙ ØÙ Ø¹ÙÙ ÙØ±Øµ Ø§ÙÙUSB
 
-#: ../liveusb/creator.py:429
+#: ../liveusb/creator.py:400
 #, python-format
 msgid Creating %sMB persistent overlay
 msgstr ÙØªÙ Ø¥ÙØ´Ø§Ø¡ ÙÙØ§Ù ØªØ®Ø²ÙÙ Ø¯Ø§Ø¦Ù Ø¨ØØ¬Ù %s Ù
ÙØ¬Ø§Ø¨Ø§ÙØª
 
-#: ../liveusb/gui.py:534
+#: ../liveusb/gui.py:556
 msgid 
 Device is not yet mounted, so we cannot determine the amount of free space.
-  Setting a maximum limit of 8G for the persistent storage.
-msgstr ÙÙ ÙØªÙ ØªØ±ÙÙØ¨ ÙØ°Ø§ Ø§ÙØ¬ÙØ§Ø² Ø¨Ø¹Ø¯Ø ÙØ°ÙÙ ÙØ§ ÙÙ
ÙÙ ØªØØ¯ÙØ¯ Ø§ÙÙØ³Ø§ØØ© Ø§ÙÙØªØ§ØØ©. Ø³ÙØªÙ ØªØ«Ø¨ÙØª 8 Ø¬ÙØ¬Ø§ 
ÙÙÙÙØ© Ø¹Ø¸ÙÙ ÙØÙØ² Ø§ÙØªØ®Ø²ÙÙ Ø§ÙØ¯Ø§Ø¦Ù.
-
-#: ../liveusb/gui.py:197
-#, python-format
-msgid Device is too small: it must be at least %s MiB.
-msgstr ÙØ³ÙØ· Ø§ÙØªØ®Ø²ÙÙ ÙØ°Ø§ ØµØºÙØ± Ø¬Ø¯Ø§ÙØ ÙØ¬Ø¨ Ø£Ù 
ÙÙÙÙ Ø¹ÙÙ Ø§ÙØ£ÙÙ %s ÙÙØ¬Ø§Ø¨Ø§ÙØª.
+msgstr ÙÙ ÙØªÙ ØªØ±ÙÙØ¨ Ø§ÙØ¬ÙØ§Ø² Ø¨Ø¹Ø¯Ø ÙØ°ÙÙ ÙØ§ ÙÙÙÙ 
ØªØØ¯ÙØ¯ Ø³Ø¹Ø© Ø§ÙØªØ®Ø²ÙÙ Ø§ÙÙØªØ¨ÙÙØ©.
 
 #: ../liveusb/dialog.py:157
 #, python-format
 msgid Download %(distribution)s
 msgstr ØªØÙÙÙ %(distribution)s
 
-#: ../liveusb/gui.py:732
+#: ../liveusb/gui.py:750
 msgid Download complete!
 msgstr ØªÙ Ø§ÙØªØÙÙÙ!
 
-#: ../liveusb/gui.py:736
+#: ../liveusb/gui.py:754
 msgid Download failed: 
 msgstr Ø§ÙØªØÙÙÙ ÙØ´Ù: 
 
-#: ../liveusb/gui.py:84
+#: ../liveusb/gui.py:88
 #, python-format
 msgid Downloading %s...
 msgstr Ø¬Ø§Ø±Ù Ø§ÙØªØÙÙÙ %s...
 
-#: ../liveusb/creator.py:1116
+#: ../liveusb/creator.py:1102
 msgid Drive is a loopback, skipping MBR reset
 msgstr ÙÙØ¹ Ø§ÙÙØ±Øµ loopback Ø Ø³ÙØªÙ ØªØ¬Ø§ÙØ² Ø¥Ø¹Ø§Ø¯Ø© Ø¶Ø¨Ø· 
Ø³Ø¬Ù Ø§ÙØ¥ÙÙØ§Ø¹ Ø§ÙØ±Ø¦ÙØ³Ù
 
-#: ../liveusb/creator.py:1196
+#: ../liveusb/creator.py:808
+#, python-format
+msgid Entering unmount_device for '%(device)s'
+msgstr ÙØªÙ Ø§ÙØ¯Ø®ÙÙ Ø¹ÙÙ unmount_device ÙÙØ¬ÙØ§Ø² '%(device)s'
+
+#: ../liveusb/creator.py:1182
 msgid Error probing device
 msgstr Ø®Ø·Ø£ Ø¨ÙØØµ Ø§ÙØ¬ÙØ§Ø²
 
-#: ../liveusb/gui.py:226
+#: ../liveusb/gui.py:227
 msgid 
 Error: Cannot set the label or obtain the UUID of your device.  Unable to 
 continue.
 msgstr Ø®Ø·Ø£: ÙØ§ ÙÙÙÙ Ø¶Ø¨Ø· Ø§ÙØ¹ÙÙØ§Ù Ø£Ù Ø§ÙØØµÙÙ Ø¹ÙÙ 
Ø±ÙÙ

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

2013-08-24 Thread translation

commit 008a1869cedb4c57b1ad9391172aced30407b5af
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:14 2013 +

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

diff --git a/ar/ar.po b/ar/ar.po
index a5f4cb6..44208ed 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -15,8 +15,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 16:08+0200\n
-PO-Revision-Date: 2013-08-08 09:40+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-08-24 11:14+\n
+Last-Translator: Mohammed ALDOUB voul...@gmail.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
@@ -131,7 +131,7 @@ msgstr ÙØªÙ Ø¥ÙØ´Ø§Ø¡ ÙÙØ§Ù ØªØ®Ø²ÙÙ Ø¯Ø§Ø¦Ù 
Ø¨ØØ¬Ù %s ÙÙØ¬Ø§Ø¨Ø§
 #: ../liveusb/gui.py:556
 msgid 
 Device is not yet mounted, so we cannot determine the amount of free space.
-msgstr 
+msgstr ÙÙ ÙØªÙ ØªØ±ÙÙØ¨ Ø§ÙØ¬ÙØ§Ø² Ø¨Ø¹Ø¯Ø ÙØ°ÙÙ ÙØ§ ÙÙÙÙ 
ØªØØ¯ÙØ¯ Ø³Ø¹Ø© Ø§ÙØªØ®Ø²ÙÙ Ø§ÙÙØªØ¨ÙÙØ©.
 
 #: ../liveusb/dialog.py:157
 #, python-format
@@ -158,7 +158,7 @@ msgstr ÙÙØ¹ Ø§ÙÙØ±Øµ loopback Ø Ø³ÙØªÙ ØªØ¬Ø§ÙØ² 
Ø¥Ø¹Ø§Ø¯Ø© Ø¶Ø¨Ø· Ø³Ø¬
 #: ../liveusb/creator.py:808
 #, python-format
 msgid Entering unmount_device for '%(device)s'
-msgstr 
+msgstr ÙØªÙ Ø§ÙØ¯Ø®ÙÙ Ø¹ÙÙ unmount_device ÙÙØ¬ÙØ§Ø² '%(device)s'
 
 #: ../liveusb/creator.py:1182
 msgid Error probing device
@@ -259,12 +259,12 @@ msgstr ØµÙØºØ© ÙØ°Ø§ Ø§ÙÙØ³Ù ÙÙ FAT16Ø Ø³ÙØªÙ 
ØªØØ¯ÙØ¯ Ø§ÙÙØ³Ø§Ø
 
 #: ../liveusb/gui.py:539
 msgid Partition is FAT32; Restricting overlay size to 4G
-msgstr 
+msgstr ØµÙØºØ© ØªÙØ³ÙÙØ© Ø§ÙØªØ®Ø²ÙÙ ÙÙ FAT32Ø Ù ÙØ°Ø§ Ø³ÙØØ¯ 
ØØ¬Ù Ø§ÙÙÙÙØ§Øª Ø¥ÙÙ Ù¤ Ø¬ÙØ¬Ø§Ø¨Ø§ÙØª.
 
 #: ../liveusb/creator.py:226 ../liveusb/creator.py:837
 #, python-format
 msgid Partitioning device %(device)s
-msgstr 
+msgstr ØªÙØ³ÙÙ Ø§ÙØ¬ÙØ§Ø² %(device)s
 
 #: ../liveusb/gui.py:610
 msgid Persistent Storage
@@ -466,12 +466,12 @@ msgstr Ø¥ØµØ¯Ø§Ø± ØºÙØ± ÙØ¹Ø±ÙÙ: %s
 #: ../liveusb/creator.py:822
 #, python-format
 msgid Unmounting '%(udi)s' on '%(device)s'
-msgstr 
+msgstr Ø¥Ø²Ø§ÙØ© ØªØ«Ø¨ÙØª '%(udi)s' Ø¹ÙÙ '%(device)s'
 
 #: ../liveusb/creator.py:818
 #, python-format
 msgid Unmounting mounted filesystems on '%(device)s'
-msgstr 
+msgstr Ø¥Ø²Ø§ÙØ© ØªØ«Ø¨ÙØª ÙØ¸Ø§Ù Ø§ÙÙÙÙØ§Øª ÙÙ '%(device)s'
 
 #: ../liveusb/creator.py:765 ../liveusb/creator.py:877
 #, python-format

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

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

2013-08-24 Thread translation

commit 297617b509bb25a87df83045049a6d8471aa0675
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:45 2013 +

Update translations for tails-misc
---
 ar.po |   70 -
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/ar.po b/ar.po
index c1aa777..8927aed 100644
--- a/ar.po
+++ b/ar.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 14:06+0200\n
-PO-Revision-Date: 2013-08-24 10:46+\n
+PO-Revision-Date: 2013-08-24 11:16+\n
 Last-Translator: Mohammed ALDOUB voul...@gmail.com\n
 Language-Team: Arabic 
(http://www.transifex.com/projects/p/torproject/language/ar/)\n
 MIME-Version: 1.0\n
@@ -108,12 +108,12 @@ msgstr Ø¨ØµÙØ© Ø§ÙÙÙØªØ§Ø:
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:394
 msgid User ID:
 msgid_plural User IDs:
-msgstr[0] 
-msgstr[1] 
-msgstr[2] 
-msgstr[3] 
-msgstr[4] 
-msgstr[5] 
+msgstr[0]  
+msgstr[1] ÙÙÙØ© Ø§ÙÙØ³ØªØ®Ø¯Ù:
+msgstr[2] ÙÙÙØ§Øª Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ:
+msgstr[3] ÙÙÙØ§Øª Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ:
+msgstr[4] ÙÙÙØ§Øª Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ:
+msgstr[5] ÙÙÙØ§Øª Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:424
 msgid None (Don't sign)
@@ -148,22 +148,22 @@ msgstr ÙÙ ØªØ«Ù Ø¨ÙØ°Ù Ø§ÙÙÙØ§ØªÙØØ
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:551
 msgid The following selected key is not fully trusted:
 msgid_plural The following selected keys are not fully trusted:
-msgstr[0] 
-msgstr[1] 
-msgstr[2] 
-msgstr[3] 
-msgstr[4] 
-msgstr[5] 
+msgstr[0]  
+msgstr[1] Ø§ÙÙÙØªØ§Ø Ø§ÙØªØ§ÙÙ ØºÙØ± ÙÙØ«ÙÙ Ø¨Ø§ÙÙØ§ÙÙ:
+msgstr[2] Ø§ÙÙÙØ§ØªÙØ Ø§ÙØªØ§ÙÙØ© ØºÙØ± ÙÙØ«ÙÙØ© Ø¨Ø§ÙÙØ§ÙÙ:
+msgstr[3] Ø§ÙÙÙØ§ØªÙØ Ø§ÙØªØ§ÙÙØ© ØºÙØ± ÙÙØ«ÙÙØ© Ø¨Ø§ÙÙØ§ÙÙ:
+msgstr[4] Ø§ÙÙÙØ§ØªÙØ Ø§ÙØªØ§ÙÙØ© ØºÙØ± ÙÙØ«ÙÙØ© Ø¨Ø§ÙÙØ§ÙÙ:
+msgstr[5] Ø§ÙÙÙØ§ØªÙØ Ø§ÙØªØ§ÙÙØ© ØºÙØ± ÙÙØ«ÙÙØ© Ø¨Ø§ÙÙØ§ÙÙ:
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:569
 msgid Do you trust this key enough to use it anyway?
 msgid_plural Do you trust these keys enough to use them anyway?
-msgstr[0] 
-msgstr[1] 
-msgstr[2] 
-msgstr[3] 
-msgstr[4] 
-msgstr[5] 
+msgstr[0]  
+msgstr[1] ÙÙ ØªØ«Ù Ø¨ÙØ°Ø§ Ø§ÙÙÙØªØ§Ø Ø¨Ø§ÙÙØ¯Ø± Ø§ÙÙØ§ÙÙ 
ÙØ§Ø³ØªØ®Ø¯Ø§ÙÙ Ø¹ÙÙ Ø£ÙØ© ØØ§ÙØ
+msgstr[2] ÙÙ ØªØ«Ù Ø¨ÙØ°Ù Ø§ÙÙÙØ§ØªÙØ Ø¨Ø§ÙÙØ¯Ø± Ø§ÙÙØ§ÙÙ 
ÙØ§Ø³ØªØ®Ø¯Ø§ÙÙØ§ Ø¹ÙÙ Ø£ÙØ© ØØ§ÙØ
+msgstr[3] ÙÙ ØªØ«Ù Ø¨ÙØ°Ù Ø§ÙÙÙØ§ØªÙØ Ø¨Ø§ÙÙØ¯Ø± Ø§ÙÙØ§ÙÙ 
ÙØ§Ø³ØªØ®Ø¯Ø§ÙÙØ§ Ø¹ÙÙ Ø£ÙØ© ØØ§ÙØ
+msgstr[4] ÙÙ ØªØ«Ù Ø¨ÙØ°Ù Ø§ÙÙÙØ§ØªÙØ Ø¨Ø§ÙÙØ¯Ø± Ø§ÙÙØ§ÙÙ 
ÙØ§Ø³ØªØ®Ø¯Ø§ÙÙØ§ Ø¹ÙÙ Ø£ÙØ© ØØ§ÙØ
+msgstr[5] ÙÙ ØªØ«Ù Ø¨ÙØ°Ù Ø§ÙÙÙØ§ØªÙØ Ø¨Ø§ÙÙØ¯Ø± Ø§ÙÙØ§ÙÙ 
ÙØ§Ø³ØªØ®Ø¯Ø§ÙÙØ§ Ø¹ÙÙ Ø£ÙØ© ØØ§ÙØ
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:582
 msgid No keys selected
@@ -251,7 +251,7 @@ msgstr Ø¨Ø±Ø§ÙØ¬Ù Ø§ÙØ§Ø¶Ø§ÙÙØ©
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connexion or try to restart Tails.
-msgstr 
+msgstr ÙØ´Ù ÙÙ Ø§ÙØªØØ¯ÙØ«. Ø±Ø¨ÙØ§ ØØµÙ ÙØ°Ø§ Ø¨Ø³Ø¨Ø¨ ÙØ´ÙÙØ© 
ÙÙ Ø§ÙØ´Ø¨ÙØ©. ØªØ£ÙØ¯ ÙÙ Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ´Ø¨ÙØ© Ø£Ù Ø£Ø¹Ø¯ Ø§ÙÙ
ØØ§ÙÙØ©.
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:123
 msgid The upgrade was successful.
@@ -259,30 +259,30 @@ msgstr ØªÙ Ø§ÙØªØØ¯ÙØ« Ø¨ÙØ¬Ø§Ø.
 
 #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52
 msgid Synchronizing the system's clock
-msgstr 
+msgstr Ø¬Ø§Ø±Ù ØªØ²Ø§ÙÙ Ø³Ø§Ø¹Ø© Ø§ÙÙØ¸Ø§Ù.
 
 #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53
 msgid 
 Tor needs an accurate clock to work properly, especially for Hidden 
 Services. Please wait...
-msgstr 
+msgstr ØªÙØ± ÙØØªØ§Ø¬ Ø³Ø§Ø¹Ø© Ø¯ÙÙÙØ© ÙÙØ¹ÙÙØ Ø®ØµÙØµØ§Ù 
ÙÙØ®Ø¯ÙØ§Øª Ø§ÙÙØ®ÙÙØ©. ÙØ±Ø¬Ù Ø§ÙØ§ÙØªØ¸Ø§Ø±...
 
 #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87
 msgid Failed to synchronize the clock!
-msgstr 
+msgstr ÙØ´Ù ÙÙ ØªØ²Ø§ÙÙ Ø³Ø§Ø¹Ø© Ø§ÙÙØ¸Ø§Ù!
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:86
 #, perl-format
 msgid Unparseable line in %s
-msgstr 
+msgstr Ø³Ø·Ø± ØºÙØ± ÙØ§Ø¨Ù ÙÙØªØÙÙÙ ÙÙ %s
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:113
 msgid atom_str was passed an undefined argument
-msgstr 
+msgstr atom_str was passed an undefined argument
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:177
 msgid Empty fetched feed.
-msgstr 
+msgstr ÙØ²ÙØ¯ Ø¨ÙØ§ÙØ§Øª ÙØ§Ø±Øº.
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:194
 msgid This version of Tails has known security issues:
@@ -294,7 +294,7 @@ msgstr Ø¨Ø¯Ø¡ ØªØ´ØºÙÙ I2P
 
 #:

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

2013-08-24 Thread translation

commit 57e426c09359f5f30a953e040686d63ea28002f3
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:32 2013 +

Update translations for torbirdy_completed
---
 ar/torbirdy.dtd |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd
index 3956734..0ecb392 100644
--- a/ar/torbirdy.dtd
+++ b/ar/torbirdy.dtd
@@ -12,7 +12,9 @@
 !ENTITY torbirdy.prefs.save.button ØÙØ¸
 !ENTITY torbirdy.prefs.save.key Ù
 !ENTITY torbirdy.prefs.cancel.button Ø¥ÙØºØ§Ø¡
-!ENTITY torbirdy.prefs.extra2.button Ø§Ø®ØªØ¨Ø± Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª
+!ENTITY torbirdy.prefs.extra1.button Ø§Ø³ØªØ±Ø¬Ø¹ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª 
Ø§ÙØ§ÙØªØ±Ø§Ø¶ÙØ©
+!ENTITY torbirdy.prefs.extra1.key d
+!ENTITY torbirdy.prefs.extra2.button ÙØØµ Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¨Ø±ÙÙØ³Ù
 !ENTITY torbirdy.prefs.extra2.key Ø§
 !ENTITY torbirdy.prefs.proxy.label Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¨Ø±ÙÙØ³Ù
 !ENTITY torbirdy.prefs.privacy.label Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ®ØµÙØµÙØ©
@@ -32,15 +34,15 @@
 !ENTITY torbirdy.prefs.torification.key Ø´
 !ENTITY torbirdy.prefs.global Ø¹Ø§Ù
 !ENTITY torbirdy.prefs.imap.label ÙØ¹ÙÙÙ Ø¯Ø¹Ù Ø¥Ø±Ø³Ø§Ù Ø§ÙØ¨Ø±ÙØ¯ 
Ø¨ÙØ¸Ø§Ù IMAP [Ø§ÙÙØ¶Ø¹ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ¹Ø·Ù]
-!ENTITY torbirdy.prefs.imap.key Ø¸
+!ENTITY torbirdy.prefs.imap.key Ø°
 !ENTITY torbirdy.prefs.startup_folder.label ØØ¯Ø¯ Ø¢Ø®Ø± ÙØ¬ÙØ¯ 
Ø¨Ø±ÙØ¯Ù ÙØ³ØªØ®Ø¯Ù Ø¹ÙØ¯ Ø¨Ø¯Ø¡ Ø§ÙØªØ´ØºÙÙ [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ¹Ø·ÙØ Ø§Ø®ØªØ§Ø± Ø§ÙÙÙÙØ§Øª Ø§ÙÙØÙÙÙ]
 !ENTITY torbirdy.prefs.startup_folder.key Ø¯
 !ENTITY torbirdy.prefs.timezone.label ÙØ§ ØªÙÙ Ø¨Ø¶Ø¨Ø· Ø§ÙÙÙØ·ÙØ© 
Ø§ÙØ²ÙÙÙØ© ÙØ«ÙØ¯Ø±Ø¨ÙØ±Ø¯ ÙÙØªÙÙÙØª Ø§ÙØ¹Ø§ÙÙÙ UTC [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙÙ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù UTC]
 !ENTITY torbirdy.prefs.timezone.key Ù
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label ÙÙ Ø¨ÙØ¶Ø¹ Ø¹ÙØ§ÙÙÙ 
ÙÙØ§ØªÙØ Ø§ÙÙØ±Ø³Ù Ø¥ÙÙÙÙ ÙÙ Ø±Ø³Ø§Ø¦Ù ÙØ´ÙØ±Ø© [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªØ¶Ø¹]
-!ENTITY torbirdy.prefs.enigmail_throwkeyid.key Ø±
+!ENTITY torbirdy.prefs.enigmail_throwkeyid.key Ù
 !ENTITY torbirdy.prefs.confirmemail.label Ø£ÙØ¯ ÙØ¨Ù Ø¥Ø±Ø³Ø§Ù 
Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø¥Ø°Ø§ ØªÙ ØªÙÙÙÙ Enigmail [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªÙØ£ÙØ¯]
-!ENTITY torbirdy.prefs.confirmemail.key Ù
+!ENTITY torbirdy.prefs.confirmemail.key c
 !ENTITY torbirdy.prefs.emailwizard.label ØªÙÙÙÙ Ø§ÙÙØ§Ø¦ÙØ© 
Ø§ÙØªÙÙØ§Ø¦ÙØ© ÙØ¥Ø¹Ø¯Ø§Ø¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ£ÙÙØªØ±ÙÙÙ Ø§ÙØ®Ø§ØµØ© 
Ø¨Ø«Ø§ÙØ¯Ø±Ø¨ÙØ±Ø¯ [Ø§ÙÙØ¶Ø¹ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ¹Ø·Ù]
 !ENTITY torbirdy.prefs.emailwizard.key Ø«
 !ENTITY torbirdy.prefs.renegotiation.label Ø³ÙØ§Ø Ø§ÙØ£ØªØµØ§Ù 
Ø¨Ø§ÙØ®ÙØ§Ø¯Ù Ø§ÙØªÙ  ÙØ§ ØªØ¯Ø¹Ù  SSL/TLS ÙØ¹ Ø¥Ø¹Ø§Ø¯Ø© 
Ø§ÙØªÙØ§ÙØ¶ Ø¢ÙÙØ© [Ø§ÙÙØ¶Ø¹ Ø§ÙØ£ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªØ³ÙØ]

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

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

2013-08-24 Thread translation

commit bfe7ea0854a94969ee32db4f251951f65f5df56b
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:48 2013 +

Update translations for tails-misc_completed
---
 ar.po |  467 +
 1 file changed, 467 insertions(+)

diff --git a/ar.po b/ar.po
new file mode 100644
index 000..8927aed
--- /dev/null
+++ b/ar.po
@@ -0,0 +1,467 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# anchor al3ar...@gmail.com, 2013
+# matt_santy matt_sa...@hotmail.com, 2013
+# Mohammed ALDOUB voul...@gmail.com, 2013
+# Sherief Alaa sheriefala...@gmail.com, 2013
+msgid 
+msgstr 
+Project-Id-Version: The Tor Project\n
+Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
+POT-Creation-Date: 2013-08-07 14:06+0200\n
+PO-Revision-Date: 2013-08-24 11:16+\n
+Last-Translator: Mohammed ALDOUB voul...@gmail.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
+Content-Transfer-Encoding: 8bit\n
+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
+
+#: config/chroot_local-includes/etc/whisperback/config.py:64
+#, python-format
+msgid 
+h1Help us fix your bug!/h1\n
+pRead a href=\%s\our bug reporting instructions/a./p\n
+pstrongDo not include more personal information than\n
+needed!/strong/p\n
+h2About giving us an email address/h2\n
+pIf you don't mind disclosing some bits of your identity\n
+to Tails developers, you can provide an email address to\n
+let us ask more details about the bug. Additionally entering\n
+a public PGP key enables us to encrypt such future\n
+communication./p\n
+pAnyone who can see this reply will probably infer you are\n
+a Tails user. Time to wonder how much you trust your\n
+Internet and mailbox providers?/p\n
+msgstr h1Ø³Ø§Ø¹Ø¯ÙØ§ ÙÙ ØÙ Ø§ÙÙØ´ÙÙØ©!/h1\np Ø§ÙØ±Ø£ a 
href=\%s\ØªØ¹ÙÙÙØ§Øª Ø§ÙØ§Ø¨ÙØ§Øº Ø¹Ù ÙØ´ÙÙØ© 
/a./p\npstrongÙØ§ ØªÙÙ Ø¨ØªÙÙÙØ± ÙØ¹ÙÙÙØ§Øª Ø´Ø®ØµÙØ© 
Ø§ÙØ«Ø± ÙÙ Ø§ÙÙØ§Ø²Ù!/strong/p\nh2Ø¨ÙØ§ ÙØªØ¹ÙÙ 
Ø¨ØªØ²ÙÙØ¯ÙØ§ Ø¨Ø¨Ø±ÙØ¯Ù Ø§ÙØ§ÙÙØªØ±ÙÙÙ/h2\npØ§Ø°Ø§ ÙÙ ØªÙ
Ø§ÙØ¹ ÙÙ ÙØ´Ù Ø¨Ø¹Ø¶ Ø¨ÙØ§ÙØ§ØªÙ Ø§ÙØ®ØµÙØµÙØ© ÙÙØ±ÙÙ ÙØ¨Ø±Ù
Ø¬Ù ØªØ§ÙÙØ²Ø ÙÙÙÙÙ ØªØ²ÙÙØ¯ÙØ§ Ø¨Ø¨Ø±ÙØ¯Ù Ø§ÙØ§ÙÙØªØ±ÙÙÙ 
ØØªÙ ÙØ³Ø¢ÙÙ Ø¹Ù ØªÙØ§ØµÙÙ Ø§ÙÙØ´ÙÙØ©. Ø§Ø¯Ø®Ø§Ù ÙÙØªØ§Ø 
ØªØ´ÙÙØ± Ø¨Ù Ø¬Ù Ø¨Ù ÙØ³Ø§Ø¹Ø¯ÙØ§ Ø¹ÙÙ ØªØ´ÙÙØ± 
Ø§ÙØ§ØªØµØ§Ù/p\npØ£Ù Ø´Ø®Øµ ÙÙØ±Ø£ ÙØ°Ø§ Ø§ÙØ±Ø¯ Ø³ÙØ¹ÙÙ Ø§ÙÙ 
ØªØ³ØªØ®Ø¯Ù ØªØ§ÙÙØ². ÙØ§ ØªØ±Ù ÙÙ ØªØ«Ù Ø¨ÙØ²ÙØ¯ Ø§ÙØ§ÙØªØ±ÙØª 
ÙØ¯ÙÙ Ø£Ù ÙØ²ÙØ¯ Ø®Ø¯ÙØ© Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ§ÙÙØªØ±ÙÙÙØ/p\n
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:136
+msgid OpenPGP encryption applet
+msgstr Ø¥Ø¶Ø§ÙØ© OpenPGP ÙÙØªØ´ÙÙØ±
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:139
+msgid Exit
+msgstr Ø®Ø±ÙØ¬
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:141
+msgid About
+msgstr Ø¹Ù
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:192
+msgid Encrypt Clipboard with _Passphrase
+msgstr Ø´ÙØ± Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ© Ø¨Ø§ÙØ¹Ø¨Ø§Ø±Ø© 
Ø§ÙØ³Ø±ÙØ©
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:195
+msgid Sign/Encrypt Clipboard with Public _Keys
+msgstr Ø´ÙØ±/ÙÙØ¹ Ø§ÙÙØªØ±ÙÙÙØ§ Ø¹ÙÙ Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙ
Ø¤ÙØªØ© Ø¨Ø§ÙÙÙØªØ§Ø Ø§ÙØ¹Ø§Ù
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:200
+msgid _Decrypt/Verify Clipboard
+msgstr Ø§ÙØªØ ØªØ´ÙÙØ±/ØªØÙÙ ÙÙ Ø§ÙØªÙÙÙØ¹ Ø§ÙØ§ÙÙØªØ±ÙÙÙ 
Ø¹ÙÙ Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ©
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:204
+msgid _Manage Keys
+msgstr Ø¥Ø¯Ø§Ø±Ø© Ø§ÙÙÙØ§ØªÙØ
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:244
+msgid The clipboard does not contain valid input data.
+msgstr Ø°Ø§ÙØ±Ø© Ø§ÙÙØ³Ø® Ø§ÙÙØ¤ÙØªØ© ÙØ§ ØªØØªÙÙ ÙØ¯Ø®ÙØ§Øª 
Ø³ÙÙÙØ©.
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:294
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:296
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:298
+msgid Unknown Trust
+msgstr ØºÙØ± ÙÙØ«ÙÙ Ø¨Ù
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:300
+msgid Marginal Trust
+msgstr Ø«ÙØ© Ø¬Ø²Ø¦ÙØ©
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:302
+msgid Full Trust
+msgstr Ø«ÙØ© ÙØ§ÙÙØ©
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:304
+msgid Ultimate Trust
+msgstr Ø«ÙØ© ÙÙØ§Ø¦ÙØ©
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:357
+msgid Name
+msgstr Ø§ÙØ§Ø³Ù
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:358
+msgid Key ID
+msgstr ÙÙÙØ© Ø§ÙÙÙØªØ§Ø
+
+#:

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

2013-08-24 Thread translation

commit c180177e03c22d56f045a7c5d27b7266c62a53a6
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:16:28 2013 +

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

diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd
index 49e9250..0ecb392 100644
--- a/ar/torbirdy.dtd
+++ b/ar/torbirdy.dtd
@@ -14,7 +14,7 @@
 !ENTITY torbirdy.prefs.cancel.button Ø¥ÙØºØ§Ø¡
 !ENTITY torbirdy.prefs.extra1.button Ø§Ø³ØªØ±Ø¬Ø¹ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª 
Ø§ÙØ§ÙØªØ±Ø§Ø¶ÙØ©
 !ENTITY torbirdy.prefs.extra1.key d
-!ENTITY torbirdy.prefs.extra2.button 
+!ENTITY torbirdy.prefs.extra2.button ÙØØµ Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¨Ø±ÙÙØ³Ù
 !ENTITY torbirdy.prefs.extra2.key Ø§
 !ENTITY torbirdy.prefs.proxy.label Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¨Ø±ÙÙØ³Ù
 !ENTITY torbirdy.prefs.privacy.label Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ®ØµÙØµÙØ©
@@ -42,7 +42,7 @@
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label ÙÙ Ø¨ÙØ¶Ø¹ Ø¹ÙØ§ÙÙÙ 
ÙÙØ§ØªÙØ Ø§ÙÙØ±Ø³Ù Ø¥ÙÙÙÙ ÙÙ Ø±Ø³Ø§Ø¦Ù ÙØ´ÙØ±Ø© [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªØ¶Ø¹]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key Ù
 !ENTITY torbirdy.prefs.confirmemail.label Ø£ÙØ¯ ÙØ¨Ù Ø¥Ø±Ø³Ø§Ù 
Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø¥Ø°Ø§ ØªÙ ØªÙÙÙÙ Enigmail [Ø§ÙÙØ¶Ø¹ 
Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªÙØ£ÙØ¯]
-!ENTITY torbirdy.prefs.confirmemail.key 
+!ENTITY torbirdy.prefs.confirmemail.key c
 !ENTITY torbirdy.prefs.emailwizard.label ØªÙÙÙÙ Ø§ÙÙØ§Ø¦ÙØ© 
Ø§ÙØªÙÙØ§Ø¦ÙØ© ÙØ¥Ø¹Ø¯Ø§Ø¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ£ÙÙØªØ±ÙÙÙ Ø§ÙØ®Ø§ØµØ© 
Ø¨Ø«Ø§ÙØ¯Ø±Ø¨ÙØ±Ø¯ [Ø§ÙÙØ¶Ø¹ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù: ÙØ¹Ø·Ù]
 !ENTITY torbirdy.prefs.emailwizard.key Ø«
 !ENTITY torbirdy.prefs.renegotiation.label Ø³ÙØ§Ø Ø§ÙØ£ØªØµØ§Ù 
Ø¨Ø§ÙØ®ÙØ§Ø¯Ù Ø§ÙØªÙ  ÙØ§ ØªØ¯Ø¹Ù  SSL/TLS ÙØ¹ Ø¥Ø¹Ø§Ø¯Ø© 
Ø§ÙØªÙØ§ÙØ¶ Ø¢ÙÙØ© [Ø§ÙÙØ¶Ø¹ Ø§ÙØ£ÙØªØ±Ø§Ø¶Ù: ÙØ§ ØªØ³ÙØ]

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

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

2013-08-24 Thread translation

commit 516a7a6755a6c1260e0889165b5c7a3441827002
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:46:19 2013 +

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

diff --git a/ar/ar.po b/ar/ar.po
index 44208ed..a3abd91 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -15,7 +15,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 16:08+0200\n
-PO-Revision-Date: 2013-08-24 11:14+\n
+PO-Revision-Date: 2013-08-24 11:20+\n
 Last-Translator: Mohammed ALDOUB voul...@gmail.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/liveusb-creator] Update translations for liveusb-creator

2013-08-24 Thread translation

commit 411c1218b772dcff3a337959ada125e65f4f6935
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:46:15 2013 +

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

diff --git a/ar/ar.po b/ar/ar.po
index 44208ed..a3abd91 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -15,7 +15,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 16:08+0200\n
-PO-Revision-Date: 2013-08-24 11:14+\n
+PO-Revision-Date: 2013-08-24 11:20+\n
 Last-Translator: Mohammed ALDOUB voul...@gmail.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-misc_completed] Update translations for tails-misc_completed

2013-08-24 Thread translation

commit 81f1e5e5eeb5a560d325ecff83942ea4b4b154a2
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:46:46 2013 +

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

diff --git a/ar.po b/ar.po
index 8927aed..eeda91e 100644
--- a/ar.po
+++ b/ar.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 14:06+0200\n
-PO-Revision-Date: 2013-08-24 11:16+\n
+PO-Revision-Date: 2013-08-24 11:20+\n
 Last-Translator: Mohammed ALDOUB voul...@gmail.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-misc] Update translations for tails-misc

2013-08-24 Thread translation

commit a90f8f22c814a6454cbcee078de9f5de2e6d7b22
Author: Translation commit bot translat...@torproject.org
Date:   Sat Aug 24 11:46:42 2013 +

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

diff --git a/ar.po b/ar.po
index 8927aed..eeda91e 100644
--- a/ar.po
+++ b/ar.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-08-07 14:06+0200\n
-PO-Revision-Date: 2013-08-24 11:16+\n
+PO-Revision-Date: 2013-08-24 11:20+\n
 Last-Translator: Mohammed ALDOUB voul...@gmail.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] r26315: {website} add financial statements for 2012. (in website/trunk/about: en findoc)

2013-08-24 Thread Andrew Lewman

Author: phobos
Date: 2013-08-24 12:58:01 + (Sat, 24 Aug 2013)
New Revision: 26315

Added:
   website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf
   website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf.asc
Modified:
   website/trunk/about/en/financials.wml
Log:
add financial statements for 2012.


Modified: website/trunk/about/en/financials.wml
===
--- website/trunk/about/en/financials.wml   2013-08-22 23:14:27 UTC (rev 
26314)
+++ website/trunk/about/en/financials.wml   2013-08-24 12:58:01 UTC (rev 
26315)
@@ -18,6 +18,7 @@
 Annual Report/a/dd
dda href=findoc/2012-TorProject-Form990.pdf2012 IRS Form 
990/a/dd
dda href=findoc/2012-TorProject-FormPC.pdf2012 State of MA Form 
PC/a/dd
+   dda href=findoc/2012-TorProject-FinancialStatements.pdf2012 
Financial Statements/a/dd
 dtFiscal Year 2011/dt
 dda href=findoc/2011-TorProject-Amended-Final-Report.pdf2011
 Financial Statements and Audit Report/a/dd

Added: website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf
===
(Binary files differ)


Property changes on: 
website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf
___
Added: svn:mime-type
   + application/octet-stream

Added: website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf.asc
===
--- website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf.asc  
(rev 0)
+++ website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf.asc  
2013-08-24 12:58:01 UTC (rev 26315)
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIcBAABCAAGBQJSGK02AAoJEGJ97ihrTWR1z2cP/3C0s3M6QGrxc5xYcG4TLq+6
+DIsZD2rP45ax///kP7ZZlxGO3gEwl9dgiCYw3H8EAbZ2csI9TvpeeJ39w/rrLMcB
+MgGXKrsDGfr+oCKVJ+rbAeJWNXL1mQ9YP8q6Gjj7hI34HLFyVNs4hXSUITpt58IQ
+BdUL3OHlZOqDL/fDk6ekXrN9KtEWM6bTEi1+W8Fhqa/Iy64FkoWzsGKRBWkgVZTr
+McXqIYKm8J1HBOSR2fNyo9TbwSwMQEBaKnWnu/KP+Sirc1Fem6WF4qKBesbFCrmz
+PfCK1HHg/VKv4QvNKXjhbqi00n3UdLHGk7ykK2F4K1kfwEoVrzYSU95d+Gv39NI2
+Qu/9D5gyJEVEjK9FC84CjhTMQcZAHrZg6+Zs9lOPLePAH387od1PJMQGrTxmyIE1
+PSSsMtI0WSUSVoQIQzRrdhXmDyopcgGuTC0aXZmRDFjYUIAyRMfE+9IzF+6RkWLb
+59B51RzwA0MfYkEUg/NyPrr8GLRdlt/64HBahaSt6cazy/p/cVMXZnRoIMOSXXSX
+Mon6kz8Ya53Up4piOM0TWgBR1ApT6wKKx5zuvgonzQspPHzCeHk1Osw1aBKgG8rz
+yh7eUzqZxP/VrrJs/9UswgKvvA0XlY9CDRCEe3v5mkPeoWhX1wCxnbLQP0FK5/66
+DPE74WuS5CykFd16EXPv
+=NIfQ
+-END PGP SIGNATURE-


Property changes on: 
website/trunk/about/findoc/2012-TorProject-FinancialStatements.pdf.asc
___
Added: svn:mime-type
   + text/plain

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

[tor-commits] [stem/master] Handling bridge-ip-versions as a general extrainfo field

2013-08-24 Thread atagar

commit c076038e82fcd5f5188ec7f889c9c9dc5d5eafd3
Author: Damian Johnson ata...@torproject.org
Date:   Sat Aug 24 10:45:14 2013 -0700

Handling bridge-ip-versions as a general extrainfo field

In commit 0d01ad6 I added support for the 'bridge-ip-versions' lines. These 
are
only relevant to bridge descriptors, and ineed don't presently appear in the
extrainfo consensus. However, that once could be said about the 'bridge-ips'
field too.

It's wrong for bridge attributes to appear on public relays, but there's
nothing in the spec prohibiting it. Hence moving this attribute's handler to
the common ExtraInfoDescriptor parent class.
---
 stem/descriptor/extrainfo_descriptor.py |   36 +++
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/stem/descriptor/extrainfo_descriptor.py 
b/stem/descriptor/extrainfo_descriptor.py
index 8c2b19e..a314e86 100644
--- a/stem/descriptor/extrainfo_descriptor.py
+++ b/stem/descriptor/extrainfo_descriptor.py
@@ -309,6 +309,7 @@ class ExtraInfoDescriptor(Descriptor):
   :var dict bridge_ips: mapping of locales to rounded count of unique user ips
   :var datetime geoip_start_time: replaced by bridge_stats_end (deprecated)
   :var dict geoip_client_origins: replaced by bridge_ips (deprecated)
+  :var dict ip_versions: mapping of ip protocols to a rounded count for the 
number of users
 
   **\*** attribute is either required when we're parsed with validation or has
   a default value, others are left as **None** if undefined
@@ -404,6 +405,8 @@ class ExtraInfoDescriptor(Descriptor):
 self.geoip_start_time = None
 self.geoip_client_origins = None
 
+self.ip_versions = None
+
 self._unrecognized_lines = []
 
 entries = _get_descriptor_components(raw_contents, validate)
@@ -786,6 +789,20 @@ class ExtraInfoDescriptor(Descriptor):
   self.entry_ips = locale_usage
 elif keyword == bridge-ips:
   self.bridge_ips = locale_usage
+  elif keyword == bridge-ip-versions:
+self.ip_versions = {}
+
+if value:
+  for entry in value.split(','):
+if not '=' in entry:
+  raise stem.ProtocolError(The bridge-ip-versions should be a 
comma separated listing of 'protocol=count' mappings: %s % line)
+
+protocol, count = entry.split('=', 1)
+
+if not count.isdigit():
+  raise stem.ProtocolError(IP protocol count was non-numeric 
(%s): %s % (count, line))
+
+self.ip_versions[protocol] = int(count)
   else:
 self._unrecognized_lines.append(line)
 
@@ -862,12 +879,9 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor):
   
   Bridge extra-info descriptor (`bridge descriptor specification
   https://metrics.torproject.org/formats.html#bridgedesc`_)
-
-  :var dict ip_versions: mapping of ip protocols to a rounded count for the 
number of users
   
 
   def __init__(self, raw_contents, validate = True):
-self.ip_versions = None
 self._digest = None
 
 super(BridgeExtraInfoDescriptor, self).__init__(raw_contents, validate)
@@ -889,22 +903,6 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor):
 
 self._digest = value
 del entries[router-digest]
-  elif keyword == bridge-ip-versions:
-self.ip_versions = {}
-
-if value:
-  for entry in value.split(','):
-if not '=' in entry:
-  raise stem.ProtocolError(The bridge-ip-versions should be a 
comma separated listing of 'protocol=count' mappings: %s % line)
-
-protocol, count = entry.split('=', 1)
-
-if not count.isdigit():
-  raise stem.ProtocolError(IP protocol count was non-numeric 
(%s): %s % (count, line))
-
-self.ip_versions[protocol] = int(count)
-
-del entries[bridge-ip-versions]
 
 ExtraInfoDescriptor._parse(self, entries, validate)
 



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

[tor-commits] [stem/master] Adding support for extrainfo descriptor's 'bridge-ip-transports'

2013-08-24 Thread atagar

commit 4a84b47b6ebbd3a740884fd8e24f499b79582028
Author: Damian Johnson ata...@torproject.org
Date:   Sat Aug 24 10:57:59 2013 -0700

Adding support for extrainfo descriptor's 'bridge-ip-transports'

Support for a new bridge-specific extrainfo descriptor field...

  https://gitweb.torproject.org/torspec.git/commitdiff/a01bb8e8e

These are pretty much identical to bridge-ip-versions lines. Like those 
this is
part of the ExtraInfoDescriptor class rather than BridgeExtraInfoDescriptor
because the spec doesn't prohibit its appearance in public relays (though it
doesn't really make sense there).
---
 stem/descriptor/extrainfo_descriptor.py  |   16 
 test/unit/descriptor/extrainfo_descriptor.py |   14 ++
 test/unit/descriptor/tordnsel.py |2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/stem/descriptor/extrainfo_descriptor.py 
b/stem/descriptor/extrainfo_descriptor.py
index a314e86..7bfbd5a 100644
--- a/stem/descriptor/extrainfo_descriptor.py
+++ b/stem/descriptor/extrainfo_descriptor.py
@@ -310,6 +310,7 @@ class ExtraInfoDescriptor(Descriptor):
   :var datetime geoip_start_time: replaced by bridge_stats_end (deprecated)
   :var dict geoip_client_origins: replaced by bridge_ips (deprecated)
   :var dict ip_versions: mapping of ip protocols to a rounded count for the 
number of users
+  :var dict ip_versions: mapping of ip transports to a count for the number of 
users
 
   **\*** attribute is either required when we're parsed with validation or has
   a default value, others are left as **None** if undefined
@@ -406,6 +407,7 @@ class ExtraInfoDescriptor(Descriptor):
 self.geoip_client_origins = None
 
 self.ip_versions = None
+self.ip_transports = None
 
 self._unrecognized_lines = []
 
@@ -803,6 +805,20 @@ class ExtraInfoDescriptor(Descriptor):
   raise stem.ProtocolError(IP protocol count was non-numeric 
(%s): %s % (count, line))
 
 self.ip_versions[protocol] = int(count)
+  elif keyword == bridge-ip-transports:
+self.ip_transports = {}
+
+if value:
+  for entry in value.split(','):
+if not '=' in entry:
+  raise stem.ProtocolError(The bridge-ip-transports should be a 
comma separated listing of 'protocol=count' mappings: %s % line)
+
+protocol, count = entry.split('=', 1)
+
+if not count.isdigit():
+  raise stem.ProtocolError(Transport count was non-numeric (%s): 
%s % (count, line))
+
+self.ip_transports[protocol] = int(count)
   else:
 self._unrecognized_lines.append(line)
 
diff --git a/test/unit/descriptor/extrainfo_descriptor.py 
b/test/unit/descriptor/extrainfo_descriptor.py
index 957c861..b2c46b6 100644
--- a/test/unit/descriptor/extrainfo_descriptor.py
+++ b/test/unit/descriptor/extrainfo_descriptor.py
@@ -474,6 +474,20 @@ class TestExtraInfoDescriptor(unittest.TestCase):
 desc_text = get_bridge_extrainfo_descriptor({bridge-ip-versions: 
v4=24.5}, content = True)
 self.assertRaises(ValueError, RelayExtraInfoDescriptor, desc_text)
 
+  def test_bridge_ip_transports_line(self):
+
+Parses the 'bridge-ip-transports' line, which only appears in bridges.
+
+
+desc = get_bridge_extrainfo_descriptor({bridge-ip-transports: 
OR=16,??=40})
+self.assertEquals({'OR': 16, '??': 40}, desc.ip_transports)
+
+desc = get_bridge_extrainfo_descriptor({bridge-ip-transports: })
+self.assertEquals({}, desc.ip_transports)
+
+desc_text = get_bridge_extrainfo_descriptor({bridge-ip-transports: 
OR=24.5}, content = True)
+self.assertRaises(ValueError, RelayExtraInfoDescriptor, desc_text)
+
   def test_transport_line(self):
 
 Basic exercise for both a bridge and relay's transport entry.
diff --git a/test/unit/descriptor/tordnsel.py b/test/unit/descriptor/tordnsel.py
index 4944a4b..af90f6d 100644
--- a/test/unit/descriptor/tordnsel.py
+++ b/test/unit/descriptor/tordnsel.py
@@ -81,7 +81,7 @@ class TestTorDNSELDescriptor(unittest.TestCase):
 self.assertRaises(ValueError, list, _parse_file(io.BytesIO(TEST_DESC + 
MALFORMED_ENTRY_1)))
 
 # skip exit address if malformed date and validate is False
-
+
 desc = _parse_file(io.BytesIO(MALFORMED_ENTRY_2), validate=False).next()
 self.assertTrue(is_valid_fingerprint(desc.fingerprint))
 self.assertEqual(030B22437D99B2DB2908B747B6962EAD13AB4038, 
desc.fingerprint)

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

[tor-commits] [tor/maint-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-24 Thread nickm

commit 0daa26a4732234333e67d04c9b215ff6704fa9cd
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Aug 20 14:52:56 2013 -0400

Send NETINFO on receiving a NETINFO if we have not yet sent one.

(Backport to Tor 0.2.3)

Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
---
 bug9546|5 +
 src/or/command.c   |   10 ++
 src/or/connection_or.c |7 +++
 src/or/or.h|3 +++
 4 files changed, 25 insertions(+)

diff --git a/bug9546 b/bug9546
new file mode 100644
index 000..8596eac
--- /dev/null
+++ b/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on .
diff --git a/src/or/command.c b/src/or/command.c
index 8321e26..26e4e68 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -941,6 +941,16 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t 
*conn)
* trustworthy. */
   (void)my_apparent_addr;
 
+  if (! conn-handshake_state-sent_netinfo) {
+/* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+ * cell, then we would not previously have sent a NETINFO cell. Do so
+ * now. */
+if (connection_or_send_netinfo(conn)  0) {
+  connection_mark_for_close(TO_CONN(conn));
+  return;
+}
+  }
+
   if (connection_or_set_state_open(conn)0) {
 log_fn(LOG_PROTOCOL_WARN, LD_OR, Got good NETINFO cell from %s:%d; but 
was unable to make the OR connection become open.,
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5eecee0..56c6ed5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1975,6 +1975,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn-handshake_state);
 
+  if (conn-handshake_state-sent_netinfo) {
+log_warn(LD_BUG, Attempted to send an extra netinfo cell on a connection 
+ where we already sent one.);
+return 0;
+  }
+
   memset(cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2009,6 +2015,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn-handshake_state-digest_sent_data = 0;
+  conn-handshake_state-sent_netinfo = 1;
   connection_or_write_cell_to_buf(cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index dd95c34..b8f334e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*



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

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

2013-08-24 Thread nickm

commit 1ee1c8fb4fc2e4855dba4387a58162656b5b9f0f
Merge: 3727a97 b9f9110
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:29:49 2013 -0400

Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

 changes/bug9366 |4 
 src/or/config.c |7 +++
 2 files changed, 11 insertions(+)




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

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

2013-08-24 Thread nickm

commit 8611195a005ed1624bdea0632404a8c00bb19586
Merge: 8bf2892 940cef3
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:32:27 2013 -0400

Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

 changes/bug9546|   11 +++
 src/or/command.c   |   14 --
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/maint-0.2.4] Make bridges send AUTH_CHALLENGE cells

2013-08-24 Thread nickm

commit 940cef3367591fd1ee86971c202ef92aba931cb7
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 10:10:35 2013 -0400

Make bridges send AUTH_CHALLENGE cells

The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
---
 bug9546|5 -
 changes/bug9546|   11 +++
 src/or/command.c   |4 ++--
 src/or/connection_or.c |2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bug9546 b/bug9546
deleted file mode 100644
index 8596eac..000
--- a/bug9546
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-
-- When a relay is extending a circuit to a bridge, it needs to send a
-  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-  cell. Fixes bug 9546; bugfix on .
diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 000..2145e35
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+- Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+  they did not, which prevented relays from successfully connecting
+  to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+  bugfix on 0.2.3.6-alpha.
+
diff --git a/src/or/command.c b/src/or/command.c
index 26e4e68..61e1e13 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -755,8 +755,8 @@ command_process_versions_cell(var_cell_t *cell, 
or_connection_t *conn)
 const int send_versions = !started_here;
 /* If we want to authenticate, send a CERTS cell */
 const int send_certs = !started_here || public_server_mode(get_options());
-/* If we're a relay that got a connection, ask for authentication. */
-const int send_chall = !started_here  public_server_mode(get_options());
+/* If we're a host that got a connection, ask for authentication. */
+const int send_chall = !started_here;
 /* If our certs cell will authenticate us, we can send a netinfo cell
  * right now. */
 const int send_netinfo = !started_here;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 56c6ed5..fbb7c31 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2144,7 +2144,7 @@ 
connection_or_compute_authenticate_cell_body(or_connection_t *conn,
 const tor_cert_t *id_cert=NULL, *link_cert=NULL;
 const digests_t *my_digests, *their_digests;
 const uint8_t *my_id, *their_id, *client_id, *server_id;
-if (tor_tls_get_my_certs(0, link_cert, id_cert))
+if (tor_tls_get_my_certs(server, link_cert, id_cert))
   return -1;
 my_digests = tor_cert_get_id_digests(id_cert);
 their_digests = tor_cert_get_id_digests(conn-handshake_state-id_cert);



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

[tor-commits] [tor/maint-0.2.4] Make bridges send AUTH_CHALLENGE cells

2013-08-24 Thread nickm

commit cbc53a2d52a67e49e56ad9d8f5334ad623a59374
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 10:10:35 2013 -0400

Make bridges send AUTH_CHALLENGE cells

The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
---
 changes/bug9546|8 +++-
 src/or/channeltls.c|4 ++--
 src/or/connection_or.c |2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/changes/bug9546 b/changes/bug9546
index 8596eac..2145e35 100644
--- a/changes/bug9546
+++ b/changes/bug9546
@@ -2,4 +2,10 @@
 
 - When a relay is extending a circuit to a bridge, it needs to send a
   NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-  cell. Fixes bug 9546; bugfix on .
+  cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+- Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+  they did not, which prevented relays from successfully connecting
+  to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+  bugfix on 0.2.3.6-alpha.
+
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index a7953e7..f751c0d 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1262,8 +1262,8 @@ channel_tls_process_versions_cell(var_cell_t *cell, 
channel_tls_t *chan)
 const int send_versions = !started_here;
 /* If we want to authenticate, send a CERTS cell */
 const int send_certs = !started_here || public_server_mode(get_options());
-/* If we're a relay that got a connection, ask for authentication. */
-const int send_chall = !started_here  public_server_mode(get_options());
+/* If we're a host that got a connection, ask for authentication. */
+const int send_chall = !started_here;
 /* If our certs cell will authenticate us, we can send a netinfo cell
  * right now. */
 const int send_netinfo = !started_here;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 31cc9c7..d5dd447 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2218,7 +2218,7 @@ 
connection_or_compute_authenticate_cell_body(or_connection_t *conn,
 const tor_cert_t *id_cert=NULL, *link_cert=NULL;
 const digests_t *my_digests, *their_digests;
 const uint8_t *my_id, *their_id, *client_id, *server_id;
-if (tor_tls_get_my_certs(0, link_cert, id_cert))
+if (tor_tls_get_my_certs(server, link_cert, id_cert))
   return -1;
 my_digests = tor_cert_get_id_digests(id_cert);
 their_digests = tor_cert_get_id_digests(conn-handshake_state-id_cert);



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

[tor-commits] [tor/maint-0.2.3] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-24 Thread nickm

commit 0daa26a4732234333e67d04c9b215ff6704fa9cd
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Aug 20 14:52:56 2013 -0400

Send NETINFO on receiving a NETINFO if we have not yet sent one.

(Backport to Tor 0.2.3)

Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
---
 bug9546|5 +
 src/or/command.c   |   10 ++
 src/or/connection_or.c |7 +++
 src/or/or.h|3 +++
 4 files changed, 25 insertions(+)

diff --git a/bug9546 b/bug9546
new file mode 100644
index 000..8596eac
--- /dev/null
+++ b/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on .
diff --git a/src/or/command.c b/src/or/command.c
index 8321e26..26e4e68 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -941,6 +941,16 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t 
*conn)
* trustworthy. */
   (void)my_apparent_addr;
 
+  if (! conn-handshake_state-sent_netinfo) {
+/* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+ * cell, then we would not previously have sent a NETINFO cell. Do so
+ * now. */
+if (connection_or_send_netinfo(conn)  0) {
+  connection_mark_for_close(TO_CONN(conn));
+  return;
+}
+  }
+
   if (connection_or_set_state_open(conn)0) {
 log_fn(LOG_PROTOCOL_WARN, LD_OR, Got good NETINFO cell from %s:%d; but 
was unable to make the OR connection become open.,
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5eecee0..56c6ed5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1975,6 +1975,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn-handshake_state);
 
+  if (conn-handshake_state-sent_netinfo) {
+log_warn(LD_BUG, Attempted to send an extra netinfo cell on a connection 
+ where we already sent one.);
+return 0;
+  }
+
   memset(cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2009,6 +2015,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn-handshake_state-digest_sent_data = 0;
+  conn-handshake_state-sent_netinfo = 1;
   connection_or_write_cell_to_buf(cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index dd95c34..b8f334e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*



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

[tor-commits] [tor/maint-0.2.3] Make bridges send AUTH_CHALLENGE cells

2013-08-24 Thread nickm

commit 940cef3367591fd1ee86971c202ef92aba931cb7
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 10:10:35 2013 -0400

Make bridges send AUTH_CHALLENGE cells

The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
---
 bug9546|5 -
 changes/bug9546|   11 +++
 src/or/command.c   |4 ++--
 src/or/connection_or.c |2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bug9546 b/bug9546
deleted file mode 100644
index 8596eac..000
--- a/bug9546
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-
-- When a relay is extending a circuit to a bridge, it needs to send a
-  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-  cell. Fixes bug 9546; bugfix on .
diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 000..2145e35
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+- Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+  they did not, which prevented relays from successfully connecting
+  to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+  bugfix on 0.2.3.6-alpha.
+
diff --git a/src/or/command.c b/src/or/command.c
index 26e4e68..61e1e13 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -755,8 +755,8 @@ command_process_versions_cell(var_cell_t *cell, 
or_connection_t *conn)
 const int send_versions = !started_here;
 /* If we want to authenticate, send a CERTS cell */
 const int send_certs = !started_here || public_server_mode(get_options());
-/* If we're a relay that got a connection, ask for authentication. */
-const int send_chall = !started_here  public_server_mode(get_options());
+/* If we're a host that got a connection, ask for authentication. */
+const int send_chall = !started_here;
 /* If our certs cell will authenticate us, we can send a netinfo cell
  * right now. */
 const int send_netinfo = !started_here;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 56c6ed5..fbb7c31 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2144,7 +2144,7 @@ 
connection_or_compute_authenticate_cell_body(or_connection_t *conn,
 const tor_cert_t *id_cert=NULL, *link_cert=NULL;
 const digests_t *my_digests, *their_digests;
 const uint8_t *my_id, *their_id, *client_id, *server_id;
-if (tor_tls_get_my_certs(0, link_cert, id_cert))
+if (tor_tls_get_my_certs(server, link_cert, id_cert))
   return -1;
 my_digests = tor_cert_get_id_digests(id_cert);
 their_digests = tor_cert_get_id_digests(conn-handshake_state-id_cert);



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

[tor-commits] [tor/maint-0.2.3] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

2013-08-24 Thread nickm

commit 8611195a005ed1624bdea0632404a8c00bb19586
Merge: 8bf2892 940cef3
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:32:27 2013 -0400

Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

 changes/bug9546|   11 +++
 src/or/command.c   |   14 --
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

2013-08-24 Thread nickm

commit 4107ddd003c6c0f1271ad73a40114350f600dbec
Merge: 1ee1c8f cbc53a2
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:31:51 2013 -0400

Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

 changes/bug9546|   11 +++
 src/or/channeltls.c|   14 --
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

2013-08-24 Thread nickm

commit 3727a978b8ca5015c1d684a0151002cd70ab3426
Merge: 43f187e af7970b
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:29:06 2013 -0400

Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

 changes/bug9543 |4 
 src/or/config.c |   10 ++
 2 files changed, 14 insertions(+)



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

[tor-commits] [tor/maint-0.2.4] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-24 Thread nickm

commit 1bb4a4f9bdf24706a459e4aefb2b0fb75622f7ac
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Aug 20 14:52:56 2013 -0400

Send NETINFO on receiving a NETINFO if we have not yet sent one.

Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
---
 changes/bug9546|5 +
 src/or/channeltls.c|   10 ++
 src/or/connection_or.c |7 +++
 src/or/or.h|3 +++
 4 files changed, 25 insertions(+)

diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 000..8596eac
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on .
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index d758d22..a7953e7 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1474,6 +1474,16 @@ channel_tls_process_netinfo_cell(cell_t *cell, 
channel_tls_t *chan)
   /* XXX maybe act on my_apparent_addr, if the source is sufficiently
* trustworthy. */
 
+  if (! chan-conn-handshake_state-sent_netinfo) {
+/* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+ * cell, then we would not previously have sent a NETINFO cell. Do so
+ * now. */
+if (connection_or_send_netinfo(chan-conn)  0) {
+  connection_or_close_for_error(chan-conn, 0);
+  return;
+}
+  }
+
   if (connection_or_set_state_open(chan-conn)  0) {
 log_fn(LOG_PROTOCOL_WARN, LD_OR,
Got good NETINFO cell from %s:%d; but 
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 3616363..31cc9c7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2042,6 +2042,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn-handshake_state);
 
+  if (conn-handshake_state-sent_netinfo) {
+log_warn(LD_BUG, Attempted to send an extra netinfo cell on a connection 
+ where we already sent one.);
+return 0;
+  }
+
   memset(cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2083,6 +2089,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn-handshake_state-digest_sent_data = 0;
+  conn-handshake_state-sent_netinfo = 1;
   connection_or_write_cell_to_buf(cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index 3dc96b9..8c6c1e3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1357,6 +1357,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*



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

[tor-commits] [tor/maint-0.2.4] Add a 30-day maximum on user-supplied MaxCircuitDirtiness

2013-08-24 Thread nickm

commit af7970b6bcc8e546cf15e943f1bec749cce18eed
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 11:35:00 2013 -0400

Add a 30-day maximum on user-supplied MaxCircuitDirtiness

Fix for bug 9543.
---
 changes/bug9543 |4 
 src/or/config.c |   10 ++
 2 files changed, 14 insertions(+)

diff --git a/changes/bug9543 b/changes/bug9543
new file mode 100644
index 000..753947f
--- /dev/null
+++ b/changes/bug9543
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+- Avoid overflows when the user sets MaxCircuitDirtiness to a
+  ridiculously high value, by imposing a (ridiculously high) 30-day
+  maximum on MaxCircuitDirtiness.
diff --git a/src/or/config.c b/src/or/config.c
index 72ceea3..793fd55 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2266,6 +2266,10 @@ compute_publishserverdescriptor(or_options_t *options)
  * will generate too many circuits and potentially overload the network. */
 #define MIN_MAX_CIRCUIT_DIRTINESS 10
 
+/** Highest allowable value for MaxCircuitDirtiness: prevents time_t
+ * overflows. */
+#define MAX_MAX_CIRCUIT_DIRTINESS (30*24*60*60)
+
 /** Lowest allowable value for CircuitStreamTimeout; if this is too low, Tor
  * will generate too many circuits and potentially overload the network. */
 #define MIN_CIRCUIT_STREAM_TIMEOUT 10
@@ -2786,6 +2790,12 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 options-MaxCircuitDirtiness = MIN_MAX_CIRCUIT_DIRTINESS;
   }
 
+  if (options-MaxCircuitDirtiness  MAX_MAX_CIRCUIT_DIRTINESS) {
+log_warn(LD_CONFIG, MaxCircuitDirtiness option is too high; 
+ setting to %d days., MAX_MAX_CIRCUIT_DIRTINESS/86400);
+options-MaxCircuitDirtiness = MAX_MAX_CIRCUIT_DIRTINESS;
+  }
+
   if (options-CircuitStreamTimeout 
   options-CircuitStreamTimeout  MIN_CIRCUIT_STREAM_TIMEOUT) {
 log_warn(LD_CONFIG, CircuitStreamTimeout option is too short; 



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

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-08-24 Thread nickm

commit a5610cfa64189db693dbad3efaa973d6720c42fe
Merge: 4107ddd 8611195
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:33:10 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

(Using ours strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)

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

[tor-commits] [tor/maint-0.2.4] Don't allow all ORPort values to be NoAdvertise

2013-08-24 Thread nickm

commit b9f9110ac77876b0c8c4fda19b6bb138e60da655
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Aug 5 12:14:48 2013 -0400

Don't allow all ORPort values to be NoAdvertise

Fix for bug #9366
---
 changes/bug9366 |4 
 src/or/config.c |7 +++
 2 files changed, 11 insertions(+)

diff --git a/changes/bug9366 b/changes/bug9366
new file mode 100644
index 000..acc919e
--- /dev/null
+++ b/changes/bug9366
@@ -0,0 +1,4 @@
+  o Minor features (usability):
+- Warn and fail if a server is configured not to advertise any
+  ORPorts at all. (We need *something* to put in our descriptor, or
+  we just won't work.)
diff --git a/src/or/config.c b/src/or/config.c
index 72ceea3..ef90f23 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5509,6 +5509,13 @@ check_server_ports(const smartlist_t *ports,
  listening on one.);
 r = -1;
   }
+  if (n_orport_listeners  !n_orport_advertised) {
+log_warn(LD_CONFIG, We are listening on an ORPort, but not advertising 
+ any ORPorts. This will keep us from building a %s 
+ descriptor, and make us impossible to use.,
+ options-BridgeRelay ? bridge : router);
+r = -1;
+  }
   if (n_dirport_advertised  !n_dirport_listeners) {
 log_warn(LD_CONFIG, We are advertising a DirPort, but not actually 
  listening on one.);



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

[tor-commits] [tor/master] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-24 Thread nickm

commit 0daa26a4732234333e67d04c9b215ff6704fa9cd
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Aug 20 14:52:56 2013 -0400

Send NETINFO on receiving a NETINFO if we have not yet sent one.

(Backport to Tor 0.2.3)

Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
---
 bug9546|5 +
 src/or/command.c   |   10 ++
 src/or/connection_or.c |7 +++
 src/or/or.h|3 +++
 4 files changed, 25 insertions(+)

diff --git a/bug9546 b/bug9546
new file mode 100644
index 000..8596eac
--- /dev/null
+++ b/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on .
diff --git a/src/or/command.c b/src/or/command.c
index 8321e26..26e4e68 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -941,6 +941,16 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t 
*conn)
* trustworthy. */
   (void)my_apparent_addr;
 
+  if (! conn-handshake_state-sent_netinfo) {
+/* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+ * cell, then we would not previously have sent a NETINFO cell. Do so
+ * now. */
+if (connection_or_send_netinfo(conn)  0) {
+  connection_mark_for_close(TO_CONN(conn));
+  return;
+}
+  }
+
   if (connection_or_set_state_open(conn)0) {
 log_fn(LOG_PROTOCOL_WARN, LD_OR, Got good NETINFO cell from %s:%d; but 
was unable to make the OR connection become open.,
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5eecee0..56c6ed5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1975,6 +1975,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn-handshake_state);
 
+  if (conn-handshake_state-sent_netinfo) {
+log_warn(LD_BUG, Attempted to send an extra netinfo cell on a connection 
+ where we already sent one.);
+return 0;
+  }
+
   memset(cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2009,6 +2015,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn-handshake_state-digest_sent_data = 0;
+  conn-handshake_state-sent_netinfo = 1;
   connection_or_write_cell_to_buf(cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index dd95c34..b8f334e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*



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

[tor-commits] [tor/master] Send NETINFO on receiving a NETINFO if we have not yet sent one.

2013-08-24 Thread nickm

commit 1bb4a4f9bdf24706a459e4aefb2b0fb75622f7ac
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Aug 20 14:52:56 2013 -0400

Send NETINFO on receiving a NETINFO if we have not yet sent one.

Relays previously, when initiating a connection, would only send a
NETINFO after sending an AUTHENTICATE.  But bridges, when receiving a
connection, would never send AUTH_CHALLENGE.  So relays wouldn't
AUTHENTICATE, and wouldn't NETINFO, and then bridges would be
surprised to be receiving CREATE cells on a non-open circuit.

Fixes bug 9546.
---
 changes/bug9546|5 +
 src/or/channeltls.c|   10 ++
 src/or/connection_or.c |7 +++
 src/or/or.h|3 +++
 4 files changed, 25 insertions(+)

diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 000..8596eac
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on .
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index d758d22..a7953e7 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1474,6 +1474,16 @@ channel_tls_process_netinfo_cell(cell_t *cell, 
channel_tls_t *chan)
   /* XXX maybe act on my_apparent_addr, if the source is sufficiently
* trustworthy. */
 
+  if (! chan-conn-handshake_state-sent_netinfo) {
+/* If we were prepared to authenticate, but we never got an AUTH_CHALLENGE
+ * cell, then we would not previously have sent a NETINFO cell. Do so
+ * now. */
+if (connection_or_send_netinfo(chan-conn)  0) {
+  connection_or_close_for_error(chan-conn, 0);
+  return;
+}
+  }
+
   if (connection_or_set_state_open(chan-conn)  0) {
 log_fn(LOG_PROTOCOL_WARN, LD_OR,
Got good NETINFO cell from %s:%d; but 
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 3616363..31cc9c7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2042,6 +2042,12 @@ connection_or_send_netinfo(or_connection_t *conn)
 
   tor_assert(conn-handshake_state);
 
+  if (conn-handshake_state-sent_netinfo) {
+log_warn(LD_BUG, Attempted to send an extra netinfo cell on a connection 
+ where we already sent one.);
+return 0;
+  }
+
   memset(cell, 0, sizeof(cell_t));
   cell.command = CELL_NETINFO;
 
@@ -2083,6 +2089,7 @@ connection_or_send_netinfo(or_connection_t *conn)
   }
 
   conn-handshake_state-digest_sent_data = 0;
+  conn-handshake_state-sent_netinfo = 1;
   connection_or_write_cell_to_buf(cell, conn);
 
   return 0;
diff --git a/src/or/or.h b/src/or/or.h
index 3dc96b9..8c6c1e3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1357,6 +1357,9 @@ typedef struct or_handshake_state_t {
   /* True iff we've received valid authentication to some identity. */
   unsigned int authenticated : 1;
 
+  /* True iff we have sent a netinfo cell */
+  unsigned int sent_netinfo : 1;
+
   /** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*



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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

2013-08-24 Thread nickm

commit 8611195a005ed1624bdea0632404a8c00bb19586
Merge: 8bf2892 940cef3
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:32:27 2013 -0400

Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3

 changes/bug9546|   11 +++
 src/or/command.c   |   14 --
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Make bridges send AUTH_CHALLENGE cells

2013-08-24 Thread nickm

commit cbc53a2d52a67e49e56ad9d8f5334ad623a59374
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 10:10:35 2013 -0400

Make bridges send AUTH_CHALLENGE cells

The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
---
 changes/bug9546|8 +++-
 src/or/channeltls.c|4 ++--
 src/or/connection_or.c |2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/changes/bug9546 b/changes/bug9546
index 8596eac..2145e35 100644
--- a/changes/bug9546
+++ b/changes/bug9546
@@ -2,4 +2,10 @@
 
 - When a relay is extending a circuit to a bridge, it needs to send a
   NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-  cell. Fixes bug 9546; bugfix on .
+  cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+- Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+  they did not, which prevented relays from successfully connecting
+  to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+  bugfix on 0.2.3.6-alpha.
+
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index a7953e7..f751c0d 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1262,8 +1262,8 @@ channel_tls_process_versions_cell(var_cell_t *cell, 
channel_tls_t *chan)
 const int send_versions = !started_here;
 /* If we want to authenticate, send a CERTS cell */
 const int send_certs = !started_here || public_server_mode(get_options());
-/* If we're a relay that got a connection, ask for authentication. */
-const int send_chall = !started_here  public_server_mode(get_options());
+/* If we're a host that got a connection, ask for authentication. */
+const int send_chall = !started_here;
 /* If our certs cell will authenticate us, we can send a netinfo cell
  * right now. */
 const int send_netinfo = !started_here;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 31cc9c7..d5dd447 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2218,7 +2218,7 @@ 
connection_or_compute_authenticate_cell_body(or_connection_t *conn,
 const tor_cert_t *id_cert=NULL, *link_cert=NULL;
 const digests_t *my_digests, *their_digests;
 const uint8_t *my_id, *their_id, *client_id, *server_id;
-if (tor_tls_get_my_certs(0, link_cert, id_cert))
+if (tor_tls_get_my_certs(server, link_cert, id_cert))
   return -1;
 my_digests = tor_cert_get_id_digests(id_cert);
 their_digests = tor_cert_get_id_digests(conn-handshake_state-id_cert);



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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

2013-08-24 Thread nickm

commit 1ee1c8fb4fc2e4855dba4387a58162656b5b9f0f
Merge: 3727a97 b9f9110
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:29:49 2013 -0400

Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

 changes/bug9366 |4 
 src/or/config.c |7 +++
 2 files changed, 11 insertions(+)




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

[tor-commits] [tor/master] Add a 30-day maximum on user-supplied MaxCircuitDirtiness

2013-08-24 Thread nickm

commit af7970b6bcc8e546cf15e943f1bec749cce18eed
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 11:35:00 2013 -0400

Add a 30-day maximum on user-supplied MaxCircuitDirtiness

Fix for bug 9543.
---
 changes/bug9543 |4 
 src/or/config.c |   10 ++
 2 files changed, 14 insertions(+)

diff --git a/changes/bug9543 b/changes/bug9543
new file mode 100644
index 000..753947f
--- /dev/null
+++ b/changes/bug9543
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+- Avoid overflows when the user sets MaxCircuitDirtiness to a
+  ridiculously high value, by imposing a (ridiculously high) 30-day
+  maximum on MaxCircuitDirtiness.
diff --git a/src/or/config.c b/src/or/config.c
index 72ceea3..793fd55 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2266,6 +2266,10 @@ compute_publishserverdescriptor(or_options_t *options)
  * will generate too many circuits and potentially overload the network. */
 #define MIN_MAX_CIRCUIT_DIRTINESS 10
 
+/** Highest allowable value for MaxCircuitDirtiness: prevents time_t
+ * overflows. */
+#define MAX_MAX_CIRCUIT_DIRTINESS (30*24*60*60)
+
 /** Lowest allowable value for CircuitStreamTimeout; if this is too low, Tor
  * will generate too many circuits and potentially overload the network. */
 #define MIN_CIRCUIT_STREAM_TIMEOUT 10
@@ -2786,6 +2790,12 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 options-MaxCircuitDirtiness = MIN_MAX_CIRCUIT_DIRTINESS;
   }
 
+  if (options-MaxCircuitDirtiness  MAX_MAX_CIRCUIT_DIRTINESS) {
+log_warn(LD_CONFIG, MaxCircuitDirtiness option is too high; 
+ setting to %d days., MAX_MAX_CIRCUIT_DIRTINESS/86400);
+options-MaxCircuitDirtiness = MAX_MAX_CIRCUIT_DIRTINESS;
+  }
+
   if (options-CircuitStreamTimeout 
   options-CircuitStreamTimeout  MIN_CIRCUIT_STREAM_TIMEOUT) {
 log_warn(LD_CONFIG, CircuitStreamTimeout option is too short; 



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-08-24 Thread nickm

commit a5610cfa64189db693dbad3efaa973d6720c42fe
Merge: 4107ddd 8611195
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:33:10 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

(Using ours strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)




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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

2013-08-24 Thread nickm

commit 4107ddd003c6c0f1271ad73a40114350f600dbec
Merge: 1ee1c8f cbc53a2
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:31:51 2013 -0400

Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4

 changes/bug9546|   11 +++
 src/or/channeltls.c|   14 --
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 4 files changed, 34 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

2013-08-24 Thread nickm

commit 2452302354fdd6d34e1637380ffc73af067fd904
Merge: 0fd8f57 a5610cf
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:34:23 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug9366|4 
 changes/bug9543|4 
 changes/bug9546|   11 +++
 src/or/channeltls.c|   14 --
 src/or/config.c|   17 +
 src/or/connection_or.c |9 -
 src/or/or.h|3 +++
 7 files changed, 59 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Don't allow all ORPort values to be NoAdvertise

2013-08-24 Thread nickm

commit b9f9110ac77876b0c8c4fda19b6bb138e60da655
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Aug 5 12:14:48 2013 -0400

Don't allow all ORPort values to be NoAdvertise

Fix for bug #9366
---
 changes/bug9366 |4 
 src/or/config.c |7 +++
 2 files changed, 11 insertions(+)

diff --git a/changes/bug9366 b/changes/bug9366
new file mode 100644
index 000..acc919e
--- /dev/null
+++ b/changes/bug9366
@@ -0,0 +1,4 @@
+  o Minor features (usability):
+- Warn and fail if a server is configured not to advertise any
+  ORPorts at all. (We need *something* to put in our descriptor, or
+  we just won't work.)
diff --git a/src/or/config.c b/src/or/config.c
index 72ceea3..ef90f23 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5509,6 +5509,13 @@ check_server_ports(const smartlist_t *ports,
  listening on one.);
 r = -1;
   }
+  if (n_orport_listeners  !n_orport_advertised) {
+log_warn(LD_CONFIG, We are listening on an ORPort, but not advertising 
+ any ORPorts. This will keep us from building a %s 
+ descriptor, and make us impossible to use.,
+ options-BridgeRelay ? bridge : router);
+r = -1;
+  }
   if (n_dirport_advertised  !n_dirport_listeners) {
 log_warn(LD_CONFIG, We are advertising a DirPort, but not actually 
  listening on one.);



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

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

2013-08-24 Thread nickm

commit 3727a978b8ca5015c1d684a0151002cd70ab3426
Merge: 43f187e af7970b
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Aug 25 00:29:06 2013 -0400

Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

 changes/bug9543 |4 
 src/or/config.c |   10 ++
 2 files changed, 14 insertions(+)



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

[tor-commits] [tor/master] Make bridges send AUTH_CHALLENGE cells

2013-08-24 Thread nickm

commit 940cef3367591fd1ee86971c202ef92aba931cb7
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Aug 21 10:10:35 2013 -0400

Make bridges send AUTH_CHALLENGE cells

The spec requires them to do so, and not doing so creates a situation
where they can't send-test because relays won't extend to them because
of the other part of bug 9546.

Fixes bug 9546; bugfix on 0.2.3.6-alpha.
---
 bug9546|5 -
 changes/bug9546|   11 +++
 src/or/command.c   |4 ++--
 src/or/connection_or.c |2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bug9546 b/bug9546
deleted file mode 100644
index 8596eac..000
--- a/bug9546
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-
-- When a relay is extending a circuit to a bridge, it needs to send a
-  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-  cell. Fixes bug 9546; bugfix on .
diff --git a/changes/bug9546 b/changes/bug9546
new file mode 100644
index 000..2145e35
--- /dev/null
+++ b/changes/bug9546
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+
+- When a relay is extending a circuit to a bridge, it needs to send a
+  NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+  cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+
+- Bridges send AUTH_CHALLENGE cells during their handshakes; previously
+  they did not, which prevented relays from successfully connecting
+  to a bridge for self-test or bandwidth testing. Fixes bug 9546;
+  bugfix on 0.2.3.6-alpha.
+
diff --git a/src/or/command.c b/src/or/command.c
index 26e4e68..61e1e13 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -755,8 +755,8 @@ command_process_versions_cell(var_cell_t *cell, 
or_connection_t *conn)
 const int send_versions = !started_here;
 /* If we want to authenticate, send a CERTS cell */
 const int send_certs = !started_here || public_server_mode(get_options());
-/* If we're a relay that got a connection, ask for authentication. */
-const int send_chall = !started_here  public_server_mode(get_options());
+/* If we're a host that got a connection, ask for authentication. */
+const int send_chall = !started_here;
 /* If our certs cell will authenticate us, we can send a netinfo cell
  * right now. */
 const int send_netinfo = !started_here;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 56c6ed5..fbb7c31 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -2144,7 +2144,7 @@ 
connection_or_compute_authenticate_cell_body(or_connection_t *conn,
 const tor_cert_t *id_cert=NULL, *link_cert=NULL;
 const digests_t *my_digests, *their_digests;
 const uint8_t *my_id, *their_id, *client_id, *server_id;
-if (tor_tls_get_my_certs(0, link_cert, id_cert))
+if (tor_tls_get_my_certs(server, link_cert, id_cert))
   return -1;
 my_digests = tor_cert_get_id_digests(id_cert);
 their_digests = tor_cert_get_id_digests(conn-handshake_state-id_cert);



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

42 matches

Mail list logo