date:20150627

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

2015-06-27 Thread translation

commit 0777d4f569126aadd4e03d9d41786504021fabc8
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 10:15:30 2015 +

Update translations for tails-greeter_completed
---
 hu/hu.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 61ff831..4b53fbf 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ferenc sati s.fer...@gmail.com, 2015
 # Blackywantscookies gaborc...@citromail.hu, 2014
 # Lajos Pasztor mrla...@gmail.com, 2014
 # vargaviktor viktor.va...@gmail.com, 2013
@@ -12,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-10-15 16:05+0200\n
-PO-Revision-Date: 2015-06-16 23:41+\n
-Last-Translator: Blackywantscookies gaborc...@citromail.hu\n
+PO-Revision-Date: 2015-06-27 09:51+\n
+Last-Translator: Ferenc sati s.fer...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -31,7 +32,7 @@ msgstr BelÃ©pÃ©s
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid Welcome to Tails
-msgstr KÃ¶szÃ¶njÃ¼k a Trails-ben
+msgstr KÃ¶szÃ¶ntjÃ¼k a Tails-ben
 
 #: ../glade/persistencewindow.glade.h:4
 msgid Use persistence?
@@ -107,15 +108,15 @@ msgstr a 
href=\doc/first_steps/startup_options/windows_camouflage.en.html\D
 msgid 
 This option makes Tails look more like Microsoft Windows 8. This may be 
 useful in public places in order to avoid attracting suspicion.
-msgstr Ez a beÃ¡llÃtÃ¡s a Tailokat Ãºgy tÃ¼nteti fel mint ha csak Microsoft 
Windows 8 lenne. Ez talÃ¡n hasznos lehet a nyilvÃ¡nos helyeken a gyanÃº 
elkerÃ¼lÃ©se miatt.
+msgstr Ez a beÃ¡llÃtÃ¡s a Tails-et Ãºgy jelenÃti meg mintha csak Microsoft 
Windows 8 lenne. Ez hasznos lehet nyilvÃ¡nos helyeken a feltÅ±nÃ©s elkerÃ¼lÃ©se 
miatt.
 
 #: ../glade/optionswindow.glade.h:13
 msgid Activate Microsoft Windows 8 Camouflage
-msgstr Microsoft Windows 8 Ã¡lcÃ¡zÃ¡s aktivÃ¡lÃ¡sa.
+msgstr Microsoft Windows 8-os Ã¡lcÃ¡zÃ¡s aktivÃ¡lÃ¡sa.
 
 #: ../glade/optionswindow.glade.h:14
 msgid MAC address spoofing
-msgstr MAC cÃm spoofing
+msgstr MAC cÃm elrejtÃ©se
 
 #: ../glade/optionswindow.glade.h:15
 msgid 
@@ -171,7 +172,7 @@ msgstr Nyelv
 
 #: ../glade/langpanel.glade.h:3
 msgid Locale
-msgstr LokÃ¡ciÃ³
+msgstr OrszÃ¡g
 
 #: ../glade/langpanel.glade.h:4
 msgid Layout

___
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

2015-06-27 Thread translation

commit 70745642dd21b7395da8cf016b477e6a91c0cceb
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 10:15:25 2015 +

Update translations for tails-greeter
---
 hu/hu.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/hu/hu.po b/hu/hu.po
index 61ff831..4b53fbf 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ferenc sati s.fer...@gmail.com, 2015
 # Blackywantscookies gaborc...@citromail.hu, 2014
 # Lajos Pasztor mrla...@gmail.com, 2014
 # vargaviktor viktor.va...@gmail.com, 2013
@@ -12,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-10-15 16:05+0200\n
-PO-Revision-Date: 2015-06-16 23:41+\n
-Last-Translator: Blackywantscookies gaborc...@citromail.hu\n
+PO-Revision-Date: 2015-06-27 09:51+\n
+Last-Translator: Ferenc sati s.fer...@gmail.com\n
 Language-Team: Hungarian 
(http://www.transifex.com/projects/p/torproject/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -31,7 +32,7 @@ msgstr BelÃ©pÃ©s
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid Welcome to Tails
-msgstr KÃ¶szÃ¶njÃ¼k a Trails-ben
+msgstr KÃ¶szÃ¶ntjÃ¼k a Tails-ben
 
 #: ../glade/persistencewindow.glade.h:4
 msgid Use persistence?
@@ -107,15 +108,15 @@ msgstr a 
href=\doc/first_steps/startup_options/windows_camouflage.en.html\D
 msgid 
 This option makes Tails look more like Microsoft Windows 8. This may be 
 useful in public places in order to avoid attracting suspicion.
-msgstr Ez a beÃ¡llÃtÃ¡s a Tailokat Ãºgy tÃ¼nteti fel mint ha csak Microsoft 
Windows 8 lenne. Ez talÃ¡n hasznos lehet a nyilvÃ¡nos helyeken a gyanÃº 
elkerÃ¼lÃ©se miatt.
+msgstr Ez a beÃ¡llÃtÃ¡s a Tails-et Ãºgy jelenÃti meg mintha csak Microsoft 
Windows 8 lenne. Ez hasznos lehet nyilvÃ¡nos helyeken a feltÅ±nÃ©s elkerÃ¼lÃ©se 
miatt.
 
 #: ../glade/optionswindow.glade.h:13
 msgid Activate Microsoft Windows 8 Camouflage
-msgstr Microsoft Windows 8 Ã¡lcÃ¡zÃ¡s aktivÃ¡lÃ¡sa.
+msgstr Microsoft Windows 8-os Ã¡lcÃ¡zÃ¡s aktivÃ¡lÃ¡sa.
 
 #: ../glade/optionswindow.glade.h:14
 msgid MAC address spoofing
-msgstr MAC cÃm spoofing
+msgstr MAC cÃm elrejtÃ©se
 
 #: ../glade/optionswindow.glade.h:15
 msgid 
@@ -171,7 +172,7 @@ msgstr Nyelv
 
 #: ../glade/langpanel.glade.h:3
 msgid Locale
-msgstr LokÃ¡ciÃ³
+msgstr OrszÃ¡g
 
 #: ../glade/langpanel.glade.h:4
 msgid Layout

___
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] Fix changelog

2015-06-27 Thread mikeperry

commit 1beeae7c20d255944de418cc9b7409d5d5c58683
Author: Mike Perry mikeperry-...@torproject.org
Date:   Fri Jun 26 23:14:26 2015 -0700

Fix changelog
---
 Bundle-Data/Docs/ChangeLog.txt |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index b54bb5d..16c0c62 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -28,11 +28,11 @@ Tor Browser 5.0a3 -- June 30 2015
* Bug 15910: Disable GMPs for now
* Bug 13670: Isolate OCSP requests by first party domain
* Bug 16448: Isolate favicon requests by first party
-   * Bug 7561: Disable FTP caching
+   * Bug 7561: Disable FTP request caching
+   * Bug 6503: Fix single-word URL bar searching
+   * Bug 15526: ES6 page crashes Tor Browser
  * Mac OS
* Use OSX 10.7 SDK
- * Windows
-   * Bug 13419: Fix cross-compiling for mingw-64
  * Build System
* Bug 16351: Upgrade our toolchain to use GCC 5.1 and Binutils 2.25
* Bug 15772 and child tickets: Update build system for Firefox 38

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

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2015-06-27 Thread translation

commit 5ab4d18d8eb4772b9de837f90b27724dcee2e731
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 07:15:58 2015 +

Update translations for abouttor-homepage_completed
---
 he/aboutTor.dtd |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index 545dbdd..e6fcce3 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -1,5 +1,5 @@
 !--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
- See LICENSE for licensing information.
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   --
@@ -8,7 +8,7 @@
 
 !ENTITY aboutTor.outOfDateTorOn.label ××× ×¢× ×××ª, ××¤××¤× ×× 
××× × × ××¢××××.
 !ENTITY aboutTor.outOfDateTorOff.label ××× ××, ××¤××¤× ×× ××× × 
××¢××××.
-!ENTITY aboutTor.outOfDate2.label ×××¦× ×¢× ×××¦× ×××××¨ ××× 
×××¨× ××××¨×× ××ª ×¢×××× ×××××ª ×××¤××¤× ×©× Tor.
+!ENTITY aboutTor.outOfDate2.label ×××¥ ×¢× ×××¦× ××× ×××¨ 
××××§ ×©××¨×× ××¤××¤× Tor.
 
 !ENTITY aboutTor.check.label ××××§×ª ××××¨××ª ×¨×©×ª Tor
 
@@ -25,6 +25,7 @@
 
 !ENTITY aboutTor.searchSPPost.link https://startpage.com/rth/search;
 !ENTITY aboutTor.searchDDGPost.link https://duckduckgo.com/html/;
+!ENTITY aboutTor.searchDCPost.link 
https://search.disconnect.me/searchTerms/search?ses=Googleamp;location_option=USamp;source=tor;
 
 !ENTITY aboutTor.torInfo1.label ××××¢ × ××¡×£:
 !ENTITY aboutTor.torInfo2.label ×××× × ×××ª×××ª IP:

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2015-06-27 Thread translation

commit 94a7d47344910a4dce03bdc74a455449195e89b9
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 07:15:53 2015 +

Update translations for abouttor-homepage
---
 he/aboutTor.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index ad235a4..e6fcce3 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 !ENTITY aboutTor.outOfDateTorOn.label ××× ×¢× ×××ª, ××¤××¤× ×× 
××× × × ××¢××××.
 !ENTITY aboutTor.outOfDateTorOff.label ××× ××, ××¤××¤× ×× ××× × 
××¢××××.
-!ENTITY aboutTor.outOfDate2.label Click on the onion and then choose Check 
for Tor Browser Update.
+!ENTITY aboutTor.outOfDate2.label ×××¥ ×¢× ×××¦× ××× ×××¨ 
××××§ ×©××¨×× ××¤××¤× Tor.
 
 !ENTITY aboutTor.check.label ××××§×ª ××××¨××ª ×¨×©×ª Tor
 

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

[tor-commits] [tor-messenger-build/master] Update Tor Launcher to 0.2.7.6 and remove redundant patch

2015-06-27 Thread sukhbir

commit 58569abafedebfb04c500974a984bc233b6a4424
Author: Sukhbir Singh sukh...@torproject.org
Date:   Sat Jun 27 03:20:51 2015 -0400

Update Tor Launcher to 0.2.7.6 and remove redundant patch
---
 projects/tor-launcher/build|1 -
 projects/tor-launcher/config   |3 +--
 projects/tor-launcher/topdir.patch |   12 
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 66909f9..50b73fd 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -2,7 +2,6 @@
 set -e
 tar xvf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
-patch -d src -p1  ../topdir.patch
 [% IF c(var/tor_control_port) -%]
 patch -p1  ../controlport.patch
 [% END -%]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index b6d8524..3e3bc2b 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.7.2
+version: 0.2.7.6
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c(version) %]'
 gpg_keyring: mikeperry.gpg
@@ -9,7 +9,6 @@ input_files:
   - filename: torbirdy.png
   - filename: messenger.png
   - filename: logo.patch
-  - filename: topdir.patch
   - filename: controlport.patch
 content: '[% INCLUDE controlport.patch.tmpl -%]'
 refresh_input: 1
diff --git a/projects/tor-launcher/topdir.patch 
b/projects/tor-launcher/topdir.patch
deleted file mode 100644
index 747416f..000
--- a/projects/tor-launcher/topdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru tor-launcher/components/tl-process.js 
tor-launcher.n/components/tl-process.js
 tor-launcher/components/tl-process.js  2014-10-11 01:18:10.0 
+0200
-+++ tor-launcher.n/components/tl-process.js2014-09-30 13:41:39.0 
+0200
-@@ -694,7 +694,7 @@
-   {
- // For Thunderbird and Instantbird, paths are relative to this 
extension's folder.
- topDir = Cc[@mozilla.org/file/directory_service;1]
--   .getService(Ci.nsIProperties).get(ProfD, Ci.nsIFile);
-+   .getService(Ci.nsIProperties).get(CurProcD, 
Ci.nsIFile);
- topDir.append(extensions);
- topDir.append(this.kTorLauncherExtPath);
-   }

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

[tor-commits] [tor-messenger-build/master] Update preferences with revised security settings

2015-06-27 Thread sukhbir

commit 287f65fc7e496aae552e85e0b8c2fa3f6dc62e3d
Author: Sukhbir Singh sukh...@torproject.org
Date:   Sat Jun 27 04:17:20 2015 -0400

Update preferences with revised security settings
---
 projects/instantbird/preferences.patch |  158 
 1 file changed, 57 insertions(+), 101 deletions(-)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index b93c079..904a919 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -1,38 +1,17 @@
-# HG changeset patch
-# User Sukhbir Singh sukh...@torproject.org
-# Date 1416649788 18000
-# Node ID 84423e51b0535ccd21aff64f10176f3e8c05b7c3
-# Parent  ae1c9811a808a4c642d97bf9202cb7bfb866f6b1
-Update the security configuration preferences
-
 diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.js
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
-@@ -3,18 +3,16 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- pref(toolkit.defaultChromeURI, chrome://instantbird/content/blist.xul);
- pref(toolkit.singletonWindowType, Messenger:blist);
- #ifdef XP_MACOSX
- pref(browser.hiddenWindowChromeURL, 
chrome://instantbird/content/hiddenWindow.xul);
- #endif
- 
--#expand pref(general.useragent.extra.instantbird, 
Instantbird/__APP_VERSION__);
--
- #ifdef XP_UNIX
- #ifndef XP_MACOSX
- #define UNIX_BUT_NOT_MAC
+@@ -64,9 +64,6 @@
  #endif
  #endif
  
- pref(general.smoothScroll, false);
- #ifdef UNIX_BUT_NOT_MAC
-@@ -112,24 +110,16 @@ pref(browser.preferences.animateFadeIn
- pref(browser.zoom.full, true);
- pref(conversation.zoomLevel, 1.0);
- 
- pref(accessibility.typeaheadfind, false);
- pref(accessibility.typeaheadfind.timeout, 5000);
+-// Whether message related sounds should be played at all. If this is enabled
+-// then the more specific prefs are checked as well.
+-pref(messenger.options.playSounds.message, true);
+ // Specifies whether each message event should trigger a sound for incoming
+ // and outgoing messages, or when your nickname is mentioned in a chat.
+ pref(messenger.options.playSounds.outgoing, true);
+@@ -114,14 +111,6 @@
  pref(accessibility.typeaheadfind.linksonly, false);
  pref(accessibility.typeaheadfind.flashBar, 1);
  
@@ -47,36 +26,26 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  // Defines how the Application Update Service notifies the user about updates:
  //
  // AUM Set to:Minor Releases: Major Releases:
- // 0  download no prompt  download no prompt
- // 1  download no prompt  download no prompt if no 
incompatibilities
- // 2  download no prompt  prompt
- //
- // See chart in nsUpdateService.js.in for more details
-@@ -197,17 +187,17 @@ pref(browser.search.defaultenginename,
- // disable logging for the search service by default
- pref(browser.search.log, false);
+@@ -138,7 +127,7 @@
  
- // Ordering of Search Engines in the Engine list.
+ // If set to true, the Update Service will apply updates in the background
+ // when it finishes downloading them.
+-pref(app.update.staging.enabled, true);
++pref(app.update.staging.enabled, false);
+ 
+ // Update service URL:
+ // You do not need to use all the %VAR% parameters. Use what you need, 
%PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example
+@@ -198,9 +187,6 @@
  pref(browser.search.order.1,
chrome://instantbird/locale/region.properties);
  pref(browser.search.order.2,
chrome://instantbird/locale/region.properties);
  
- // send ping to the server to update
+-// send ping to the server to update
 -pref(browser.search.update, true);
-+pref(browser.search.update, false);
- 
+-
  // disable logging for the search service update system by default
  pref(browser.search.update.log, false);
  
- // Check whether we need to perform engine updates every 6 hours
- pref(browser.search.updateinterval, 6);
- 
- /* Extension manager */
-@@ -217,20 +207,18 @@ pref(xpinstall.dialog.progress.chrome,
- pref(xpinstall.dialog.progress.type.skin, Extension:Manager);
- pref(xpinstall.dialog.progress.type.chrome, Extension:Manager);
- pref(extensions.dss.enabled, false);
- pref(extensions.dss.switchPending, false);
- pref(extensions.ignoreMTimeChanges, false);
+@@ -219,10 +205,8 @@
  pref(extensions.logging.enabled, false);
  pref(general.skins.selectedSkin, classic/1.0);
  
@@ -87,44 +56,36 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  
  // Preferences for the Get Add-ons pane
  pref(extensions.getAddons.cache.enabled, false);
- pref(extensions.getAddons.browseAddons, 
https://addons.instantbird.org/%LOCALE%/%APP%;);
- pref(extensions.getAddons.maxResults, 5);
- pref(extensions.getAddons.recommended.browseURL, 
https://addons.instantbird.org/%LOCALE%/%APP%/recommended;);
- pref(extensions.getAddons.recommended.url,

[tor-commits] [tor-messenger-build/master] Update branding for ICO files

2015-06-27 Thread sukhbir

commit 3ca0be32a852390b582c1e6d307f2fa4a39074af
Author: Sukhbir Singh sukh...@torproject.org
Date:   Sat Jun 27 06:36:23 2015 -0400

Update branding for ICO files
---
 projects/instantbird/branding/blistWindow.ico   |  Bin 10058 - 9662 bytes
 projects/instantbird/branding/blistWindow48.png |  Bin 1600 - 2089 bytes
 projects/instantbird/branding/convWindow.ico|  Bin 10058 - 10058 bytes
 projects/instantbird/branding/default.ico   |  Bin 7262 - 7262 bytes
 projects/instantbird/branding/instantbird.ico   |  Bin 7262 - 7262 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/projects/instantbird/branding/blistWindow.ico 
b/projects/instantbird/branding/blistWindow.ico
index 48be229..83dfe44 100644
Binary files a/projects/instantbird/branding/blistWindow.ico and 
b/projects/instantbird/branding/blistWindow.ico differ
diff --git a/projects/instantbird/branding/blistWindow48.png 
b/projects/instantbird/branding/blistWindow48.png
index 3ce5ab5..3a14f1d 100644
Binary files a/projects/instantbird/branding/blistWindow48.png and 
b/projects/instantbird/branding/blistWindow48.png differ
diff --git a/projects/instantbird/branding/convWindow.ico 
b/projects/instantbird/branding/convWindow.ico
index 4aef538..a22977c 100644
Binary files a/projects/instantbird/branding/convWindow.ico and 
b/projects/instantbird/branding/convWindow.ico differ
diff --git a/projects/instantbird/branding/default.ico 
b/projects/instantbird/branding/default.ico
index 5a600c6..51fed13 100644
Binary files a/projects/instantbird/branding/default.ico and 
b/projects/instantbird/branding/default.ico differ
diff --git a/projects/instantbird/branding/instantbird.ico 
b/projects/instantbird/branding/instantbird.ico
index 5a600c6..51fed13 100644
Binary files a/projects/instantbird/branding/instantbird.ico and 
b/projects/instantbird/branding/instantbird.ico differ

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-06-27 Thread translation

commit f5f0f61a8cc3375edb492d8da625b82164400a45
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 14:16:18 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 zh_TW/abouttor.properties |  151 +
 1 file changed, 151 insertions(+)

diff --git a/zh_TW/abouttor.properties b/zh_TW/abouttor.properties
new file mode 100644
index 000..726fc23
--- /dev/null
+++ b/zh_TW/abouttor.properties
@@ -0,0 +1,151 @@
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
+html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'
+head
+titletorbutton - ä½¿ç¨ Tor æéå®å¨æµè¦½ç¶²è·¯ç Firefox 
æ´å±/title
+meta name='generator' content='cgit v0.10.2'/
+meta name='generator' content='cgit v0.10.2'/
+link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
+link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
+link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
+/head
+body
+div id='cgit'table id='header'
+tr
+td class='logo' rowspan='2'a href='/'img src='/static/logo.jpg' alt='cgit 
logo'//a/td
+td class='logo' rowspan='2'a href='/'img src='/static/logo.jpg' alt='cgit 
logo'//a/td
+select name='h' onchange='this.form.submit();'
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+/select input type='submit' name='' value='switch'//form/td/tr
+trtd class='sub'ä½¿ç¨ Tor æéå®å¨æµè¦½ç¶²è·¯ç Firefox 
æ´å±/tdtd class='sub right'Tor å°æ¡/td/tr/table
+table class='tabs'trtd
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'å·®ç°/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
+select name='h' onchange='this.form.submit();'
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
+/select
+input class='txt' type='text' size='10' name='q' value=''/
+input class='txt' type='text' size='10' name='q' value=''/
+/form
+/td/tr/table
+div id='cgit'table id='header'
+table class='tabs'trtd
+trtd class='sub'ä½¿ç¨ Tor æéå®å¨æµè¦½ç¶²è·¯ç Firefox 
æ´å±/tdtd class='sub right'Tor å°æ¡/td/tr/table
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'å·®ç°/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'å·®ç°/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'å·®ç°/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-06-27 Thread translation

commit 66a40f4ee8db6df685cbef1ff3dbe03e4755aa32
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 14:16:12 2015 +

Update translations for torbutton-abouttorproperties
---
 zh_TW/abouttor.properties |   83 +++--
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/zh_TW/abouttor.properties b/zh_TW/abouttor.properties
index 2dc8ac2..726fc23 100644
--- a/zh_TW/abouttor.properties
+++ b/zh_TW/abouttor.properties
@@ -2,7 +2,7 @@
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
 html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'
 head
-titletorbutton - Firefox extension for safe web browsing while using 
Tor/title
+titletorbutton - ä½¿ç¨ Tor æéå®å¨æµè¦½ç¶²è·¯ç Firefox 
æ´å±/title
 meta name='generator' content='cgit v0.10.2'/
 meta name='generator' content='cgit v0.10.2'/
 link rel='stylesheet' type='text/css' href='/cgit-css/cgit.css'/
@@ -22,10 +22,11 @@
 option value='gsoc2009-koryk'gsoc2009-koryk/option
 option value='gsoc2009-koryk'gsoc2009-koryk/option
 option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
 /select input type='submit' name='' value='switch'//form/td/tr
-trtd class='sub'Firefox extension for safe web browsing while using 
Tor/tdtd class='sub right'The Tor Project/td/tr/table
+trtd class='sub'ä½¿ç¨ Tor æéå®å¨æµè¦½ç¶²è·¯ç Firefox 
æ´å±/tdtd class='sub right'Tor å°æ¡/td/tr/table
 table class='tabs'trtd
-a href='/torbutton.git/'summary/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'log/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'tree/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
+a href='/torbutton.git/'æè¦/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'æ¥èª/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'æ¨¹/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'æäº¤/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'å·®ç°/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
 select name='h' onchange='this.form.submit();'
 option value='gsoc2009-koryk'gsoc2009-koryk/option
 option value='gsoc2009-koryk'gsoc2009-koryk/option
@@ -38,27 +39,27 @@
 /td/tr/table
 div id='cgit'table id='header'
 table class='tabs'trtd
-trtd class='sub'Firefox extension for safe web browsing while using 
Tor/tdtd class='sub right'The Tor Project/td/tr/table
-a href='/torbutton.git/'summary/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'log/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'tree/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'summary/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'log/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'tree/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'summary/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'log/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'tree/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a href='/torbutton.git/'summary/aa href='/torbutton.git/refs/'refs/aa 
href='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'log/aa 
class='active' 
href='/torbutton.git/tree/src/chrome/locale/en/aboutTor.properties'tree/aa 
href='/torbutton.git/commit/src/chrome/locale/en/aboutTor.properties'commit/aa
 
href='/torbutton.git/diff/src/chrome/locale/en/aboutTor.properties'diff/a/tdtd
 class='form'form class='right' method='get' 
action='/torbutton.git/log/src/chrome/locale/en/aboutTor.properties'
-a

[tor-commits] [tor/master] Avoid a segfault when reading an encrypted key that isn't there

2015-06-27 Thread nickm

commit 48f69685f5df3ca0f39a3da155df3b9a5cfa2b99
Author: Nick Mathewson ni...@torproject.org
Date:   Sat Jun 27 14:14:13 2015 -0400

Avoid a segfault when reading an encrypted key that isn't there

Patch from cypherpunks. Fixes bug 16449. Bug not in any released tor.
---
 src/or/routerkeys.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 2fd7f41..d075c67 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -63,7 +63,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
   r = 1;
 
  done:
-  memwipe(encrypted_key, 0, encrypted_len);
+  memwipe(encrypted_key, 0, sizeof(encrypted_key));
   memwipe(pwbuf, 0, sizeof(pwbuf));
   tor_free(tag);
   if (secret) {

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

[tor-commits] [tor-messenger-build/master] Disable typing notifications in conversations

2015-06-27 Thread sukhbir

commit 12f584d3d58b687bfa6225eb82e7f619dbe1aa18
Author: Sukhbir Singh sukh...@torproject.org
Date:   Sat Jun 27 11:21:05 2015 -0400

Disable typing notifications in conversations
---
 projects/instantbird/preferences.patch |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/instantbird/preferences.patch 
b/projects/instantbird/preferences.patch
index 904a919..53a7e7f 100644
--- a/projects/instantbird/preferences.patch
+++ b/projects/instantbird/preferences.patch
@@ -79,7 +79,7 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
  // The breakpad report server to link to in about:crashes
  pref(breakpad.reportURL, 
http://crash-stats.instantbird.com/report/index/;);
  
-@@ -297,14 +278,77 @@
+@@ -297,14 +278,79 @@
  // 3  at the end of the tabstrip
  pref(browser.tabs.closeButtons, 1);
  
@@ -139,6 +139,8 @@ diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.
 +pref(messenger.options.playSounds.message, false);
 +// Disable text formatting (remove the tags)
 +pref(messenger.options.filterMode, 0);
++// Disable typing notifications
++pref(purple.conversations.im.send_typing, false);
 +
 +// Browser
 +// Disable caching

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-06-27 Thread translation

commit c4127f589bdcfe39c46e0f67231a813a32fc5780
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:16:22 2015 +

Update translations for torbutton-aboutdialogdtd
---
 eu/aboutdialog.dtd |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eu/aboutdialog.dtd b/eu/aboutdialog.dtd
index 5099ad7..ec77d08 100644
--- a/eu/aboutdialog.dtd
+++ b/eu/aboutdialog.dtd
@@ -3,17 +3,17 @@
 !ENTITY project.tpoLink the amp;vendorShortName;
 !ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  Lagundu nahi duzu?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink Egizu dohaintza
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkegizu bat
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   Galderarik?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
 !ENTITY bottomLinks.growHelp the Tor Network Grow!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
+!ENTITY bottomLinks.license  Lizentziei Buruzko Informazioa
 !ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.

___
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

2015-06-27 Thread translation

commit d2ab2b190a31f252f10bab0ef6d19bcef1d8b9f0
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:46:02 2015 +

Update translations for tails-misc
---
 eu.po |2 +-
 uk.po |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eu.po b/eu.po
index b19f72f..3fdeceda 100644
--- a/eu.po
+++ b/eu.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2015-05-02 23:47+0200\n
-PO-Revision-Date: 2015-05-03 08:25+\n
+PO-Revision-Date: 2015-06-27 16:16+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
diff --git a/uk.po b/uk.po
index 9f040ca..e7c430c 100644
--- a/uk.po
+++ b/uk.po
@@ -14,7 +14,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2015-05-02 23:47+0200\n
-PO-Revision-Date: 2015-06-23 20:33+\n
+PO-Revision-Date: 2015-06-27 16:37+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2015-06-27 Thread translation

commit b8315bc671c190f5f6a672559819490d298d6140
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 17:16:00 2015 +

Update translations for torbutton-torbuttonproperties
---
 zh_CN/torbutton.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index 385ce6c..e67ae7a 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = æ¬æµè§å¨
 torbutton.circuit_display.relay = ä¸ç»§
 torbutton.circuit_display.tor_bridge = ç½æ¡¥
 torbutton.circuit_display.unknown_country = æªç¥å½å®¶
-torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
äºè¿äºè¾¹æ¡ï¼ä½¿æµè§å¨çªå£çå®½é«åå¾ä¸åé£ä¹ç¬ç¹ï¼ä»èè®©å¨çº¿è·è¸ªçè§åå¾æ´é¾ã
+torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
äºä¸äºè¾¹æ¡ï¼ä»¥éä½çªå£å¤§å°çç¬ç¹æ§ï¼ä»èä»¤å¨çº¿è·è¸ªçæ§åå¾æ´å
 å°é¾ã
 torbutton.panel.tooltip.disabled = ç¹å»å¯ç¨ Tor
 torbutton.panel.tooltip.enabled = ç¹å»ç¦ç¨ Tor
 torbutton.panel.plugins.disabled = ç¹å»å¯ç¨æä»¶

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

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

2015-06-27 Thread translation

commit 44a25d84b3eec091b5563bd72c098de907190978
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:15:14 2015 +

Update translations for whisperback
---
 eu/eu.po |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/eu/eu.po b/eu/eu.po
index f4276d1..117fe43 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Antxon Baldarra balda...@lavabit.com, 2012-2013
+# Antxon Baldarra balda...@bitmessage.ch, 2012-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-03-26 15:50+0100\n
-PO-Revision-Date: 2013-06-24 22:52+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2014-03-17 17:40+0100\n
+PO-Revision-Date: 2015-06-27 16:07+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
@@ -40,40 +40,40 @@ msgid 
 /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py
 msgstr %s aldagaia ez da ez /etc/whisperback/config.py, ez 
~/.whisperback/config.py, ezta ./config.py konfigurazio fitxategietan aurkitu.
 
-#: ../whisperBack/gui.py:151
+#: ../whisperBack/gui.py:154
 msgid Unable to load a valid configuration.
 msgstr Ezin izan da konfigurazio baliogarririk kargatu
 
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:220
 msgid Sending mail...
 msgstr Posta bidaltzen...
 
-#: ../whisperBack/gui.py:218
+#: ../whisperBack/gui.py:221
 msgid Sending mail
 msgstr Posta bidaltzen
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:220
+#: ../whisperBack/gui.py:223
 msgid This could take a while...
 msgstr Honek luze jo dezake...
 
-#: ../whisperBack/gui.py:234
+#: ../whisperBack/gui.py:237
 msgid The contact email adress doesn't seem valid.
 msgstr Harremanetarako email helbidea ez du baliogarria ematen.
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:254
 msgid Unable to send the mail: SMTP error.
 msgstr Ezin izan da emaila bidali: SMTP akatsa.
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:256
 msgid Unable to connect to the server.
 msgstr Ezin izan da zerbitzarira konektatu.
 
-#: ../whisperBack/gui.py:255
+#: ../whisperBack/gui.py:258
 msgid Unable to create or to send the mail.
 msgstr Ezin izan da emaila sortu edo bidali.
 
-#: ../whisperBack/gui.py:258
+#: ../whisperBack/gui.py:261
 msgid 
 \n
 \n
@@ -82,21 +82,21 @@ msgid 
 If it does not work, you will be offered to save the bug report.
 msgstr \n\nAkats txostena ezin izan da bidali, ziurrenik sare arazoengatik. 
Mesedez saiatu sarera berriz konektatzen eta sakatu bidali berriz.\n\nEz badu 
funtzionatzen, akats txostena gordetzea eskainiko zaizu.
 
-#: ../whisperBack/gui.py:271
+#: ../whisperBack/gui.py:274
 msgid Your message has been sent.
 msgstr Zure mezua bidali da.
 
-#: ../whisperBack/gui.py:278
+#: ../whisperBack/gui.py:281
 msgid An error occured during encryption.
 msgstr Akats bat gertatu da enkriptazioaren bitartean.
 
-#: ../whisperBack/gui.py:298
+#: ../whisperBack/gui.py:301
 #, python-format
 msgid Unable to save %s.
 msgstr Ezin izan da %s gorde.
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:322
+#: ../whisperBack/gui.py:325
 #, python-format
 msgid 
 The bug report could not be sent, likely due to network problems.\n
@@ -106,27 +106,27 @@ msgid 
 Do you want to save the bug report to a file?
 msgstr Akats txostena ezin izan da bidali, ziurrenik sare 
arazoengatik.\n\nLan-inguru bezala akats txostena fitxategi bat bezala USB 
batean gorde dezakezu eta guri %s ra bidaltzen saiatu zure email kontutik beste 
sistema bat erabiliz. Jakin ezazu zure akats txostena ez dela anonimoa izango 
zure kontu beste pausu batzuk ematen ez badituzu (adib. Tor erabili aldi 
baterako email kontu batekin).\n\nAkats txostena fitxategi batean gorde nahi 
duzu?
 
-#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
+#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21
 msgid WhisperBack
 msgstr WhisperBack
 
-#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
+#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2
 msgid Send feedback in an encrypted mail.
 msgstr Atzeraelikadura enkriptatutako email batean bidali.
 
-#: ../whisperBack/gui.py:390
+#: ../whisperBack/gui.py:393
 msgid Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)
 msgstr Copyright Â© 2009-2012 Tails garatzaileak (ta...@boum.org)
 
-#: ../whisperBack/gui.py:391
+#: ../whisperBack/gui.py:394
 msgid Tails developers ta...@boum.org
 msgstr Tails garatzaileak ta...@boum.org
 
-#: ../whisperBack/gui.py:392
+#: ../whisperBack/gui.py:395
 msgid translator-credits
 msgstr itzultzaile-kredituak
 
-#: ../whisperBack/gui.py:419
+#: ../whisperBack/gui.py:422
 msgid This doesn't seem to be a valid URL or OpenPGP key.
 msgstr Honek es du URL

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2015-06-27 Thread translation

commit f7e0ef85faf1a06ad7cc8c3a184283ad2d7e9382
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:15:58 2015 +

Update translations for abouttor-homepage_completed
---
 eu/aboutTor.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu/aboutTor.dtd b/eu/aboutTor.dtd
index 03bf31d..b055a40 100644
--- a/eu/aboutTor.dtd
+++ b/eu/aboutTor.dtd
@@ -25,7 +25,7 @@
 
 !ENTITY aboutTor.searchSPPost.link https://startpage.com/rth/search;
 !ENTITY aboutTor.searchDDGPost.link https://duckduckgo.com/html/;
-!ENTITY aboutTor.searchDCPost.link 
https://search.disconnect.me/searchTerms/search?ses=Googleamp;location_option=US;
+!ENTITY aboutTor.searchDCPost.link 
https://search.disconnect.me/searchTerms/search?ses=Googleamp;location_option=USamp;source=tor;
 
 !ENTITY aboutTor.torInfo1.label Informazio gehiago:
 !ENTITY aboutTor.torInfo2.label Herrialde eta IP helbidea:

___
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

2015-06-27 Thread translation

commit d42daa46e6f765ee6b0d940cd0d512263ceeecc9
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:15:34 2015 +

Update translations for tails-greeter
---
 eu/eu.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eu/eu.po b/eu/eu.po
index 869621f..e3b62f2 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -5,14 +5,14 @@
 # Translators:
 # Antxon Baldarra balda...@bitmessage.ch, 2012
 # Antxon Baldarra balda...@bitmessage.ch, 2013
-# Eneko eneku...@gmail.com, 2015
+# Eneko, 2015
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-10-15 16:05+0200\n
-PO-Revision-Date: 2015-02-01 15:51+\n
-Last-Translator: Eneko eneku...@gmail.com\n
+PO-Revision-Date: 2015-06-27 16:07+\n
+Last-Translator: Eneko\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

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

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

2015-06-27 Thread translation

commit 1a28ff2cbdcd5ab36193fb3e0f84849a7def684f
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:15:18 2015 +

Update translations for whisperback_completed
---
 eu/eu.po |   46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/eu/eu.po b/eu/eu.po
index f4276d1..117fe43 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Antxon Baldarra balda...@lavabit.com, 2012-2013
+# Antxon Baldarra balda...@bitmessage.ch, 2012-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-03-26 15:50+0100\n
-PO-Revision-Date: 2013-06-24 22:52+\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2014-03-17 17:40+0100\n
+PO-Revision-Date: 2015-06-27 16:07+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
@@ -40,40 +40,40 @@ msgid 
 /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py
 msgstr %s aldagaia ez da ez /etc/whisperback/config.py, ez 
~/.whisperback/config.py, ezta ./config.py konfigurazio fitxategietan aurkitu.
 
-#: ../whisperBack/gui.py:151
+#: ../whisperBack/gui.py:154
 msgid Unable to load a valid configuration.
 msgstr Ezin izan da konfigurazio baliogarririk kargatu
 
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:220
 msgid Sending mail...
 msgstr Posta bidaltzen...
 
-#: ../whisperBack/gui.py:218
+#: ../whisperBack/gui.py:221
 msgid Sending mail
 msgstr Posta bidaltzen
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:220
+#: ../whisperBack/gui.py:223
 msgid This could take a while...
 msgstr Honek luze jo dezake...
 
-#: ../whisperBack/gui.py:234
+#: ../whisperBack/gui.py:237
 msgid The contact email adress doesn't seem valid.
 msgstr Harremanetarako email helbidea ez du baliogarria ematen.
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:254
 msgid Unable to send the mail: SMTP error.
 msgstr Ezin izan da emaila bidali: SMTP akatsa.
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:256
 msgid Unable to connect to the server.
 msgstr Ezin izan da zerbitzarira konektatu.
 
-#: ../whisperBack/gui.py:255
+#: ../whisperBack/gui.py:258
 msgid Unable to create or to send the mail.
 msgstr Ezin izan da emaila sortu edo bidali.
 
-#: ../whisperBack/gui.py:258
+#: ../whisperBack/gui.py:261
 msgid 
 \n
 \n
@@ -82,21 +82,21 @@ msgid 
 If it does not work, you will be offered to save the bug report.
 msgstr \n\nAkats txostena ezin izan da bidali, ziurrenik sare arazoengatik. 
Mesedez saiatu sarera berriz konektatzen eta sakatu bidali berriz.\n\nEz badu 
funtzionatzen, akats txostena gordetzea eskainiko zaizu.
 
-#: ../whisperBack/gui.py:271
+#: ../whisperBack/gui.py:274
 msgid Your message has been sent.
 msgstr Zure mezua bidali da.
 
-#: ../whisperBack/gui.py:278
+#: ../whisperBack/gui.py:281
 msgid An error occured during encryption.
 msgstr Akats bat gertatu da enkriptazioaren bitartean.
 
-#: ../whisperBack/gui.py:298
+#: ../whisperBack/gui.py:301
 #, python-format
 msgid Unable to save %s.
 msgstr Ezin izan da %s gorde.
 
 #. XXX: fix string
-#: ../whisperBack/gui.py:322
+#: ../whisperBack/gui.py:325
 #, python-format
 msgid 
 The bug report could not be sent, likely due to network problems.\n
@@ -106,27 +106,27 @@ msgid 
 Do you want to save the bug report to a file?
 msgstr Akats txostena ezin izan da bidali, ziurrenik sare 
arazoengatik.\n\nLan-inguru bezala akats txostena fitxategi bat bezala USB 
batean gorde dezakezu eta guri %s ra bidaltzen saiatu zure email kontutik beste 
sistema bat erabiliz. Jakin ezazu zure akats txostena ez dela anonimoa izango 
zure kontu beste pausu batzuk ematen ez badituzu (adib. Tor erabili aldi 
baterako email kontu batekin).\n\nAkats txostena fitxategi batean gorde nahi 
duzu?
 
-#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21
+#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21
 msgid WhisperBack
 msgstr WhisperBack
 
-#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2
+#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2
 msgid Send feedback in an encrypted mail.
 msgstr Atzeraelikadura enkriptatutako email batean bidali.
 
-#: ../whisperBack/gui.py:390
+#: ../whisperBack/gui.py:393
 msgid Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)
 msgstr Copyright Â© 2009-2012 Tails garatzaileak (ta...@boum.org)
 
-#: ../whisperBack/gui.py:391
+#: ../whisperBack/gui.py:394
 msgid Tails developers ta...@boum.org
 msgstr Tails garatzaileak ta...@boum.org
 
-#: ../whisperBack/gui.py:392
+#: ../whisperBack/gui.py:395
 msgid translator-credits
 msgstr itzultzaile-kredituak
 
-#: ../whisperBack/gui.py:419
+#: ../whisperBack/gui.py:422
 msgid This doesn't seem to be a valid URL or OpenPGP key.
 msgstr Honek es

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

2015-06-27 Thread translation

commit 06c88958ece3e924b778c43c6ac6e0b3d462bbc9
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:49 2015 +

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

diff --git a/uk.po b/uk.po
index 45a0c7c..4c57016 100644
--- a/uk.po
+++ b/uk.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-12-31 04:53+0100\n
-PO-Revision-Date: 2015-02-23 08:18+\n
+PO-Revision-Date: 2015-06-27 16:37+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-06-27 Thread translation

commit a5efd8721c460ec9cd3a5cd31f58bb3a36f23ded
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:46:32 2015 +

Update translations for torbutton-abouttorproperties
---
 uk/abouttor.properties |1 +
 1 file changed, 1 insertion(+)

diff --git a/uk/abouttor.properties b/uk/abouttor.properties
index 2dc8ac2..1bd5889 100644
--- a/uk/abouttor.properties
+++ b/uk/abouttor.properties
@@ -22,6 +22,7 @@
 option value='gsoc2009-koryk'gsoc2009-koryk/option
 option value='gsoc2009-koryk'gsoc2009-koryk/option
 option value='gsoc2009-koryk'gsoc2009-koryk/option
+option value='gsoc2009-koryk'gsoc2009-koryk/option
 /select input type='submit' name='' value='switch'//form/td/tr
 trtd class='sub'Firefox extension for safe web browsing while using 
Tor/tdtd class='sub right'The Tor Project/td/tr/table
 table class='tabs'trtd

___
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

2015-06-27 Thread translation

commit c2862d3d6faa675d8d59939fdb7f9067a869b86b
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:45 2015 +

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

diff --git a/uk.po b/uk.po
index 45a0c7c..4c57016 100644
--- a/uk.po
+++ b/uk.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2014-12-31 04:53+0100\n
-PO-Revision-Date: 2015-02-23 08:18+\n
+PO-Revision-Date: 2015-06-27 16:37+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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_completed] Update translations for tails-greeter_completed

2015-06-27 Thread translation

commit d12304359e490c3f688abe7a9972de1b0ba61305
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:37 2015 +

Update translations for tails-greeter_completed
---
 uk/uk.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index fed7b57..b7e69d8 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -5,14 +5,14 @@
 # Translators:
 # LinuxChata, 2014
 # ÐÐ½Ð´ÑÑÐ¹ ÐÐ°Ð½Ð´ÑÑÐ° andriykopanyt...@gmail.com, 2014
-# lyubomyr n.lyubo...@gmail.com, 2014
+# ÐÑÐ±Ð¾Ð¼Ð¸Ñ n.lyubo...@gmail.com, 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-31 14:31+\n
-Last-Translator: lyubomyr n.lyubo...@gmail.com\n
+POT-Creation-Date: 2014-10-15 16:05+0200\n
+PO-Revision-Date: 2015-06-27 16:37+\n
+Last-Translator: ÐÑÐ±Ð¾Ð¼Ð¸Ñ n.lyubo...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -199,7 +199,7 @@ msgid 
 %(stderr)s
 msgstr live-persist Ð½Ðµ ÑÐ¿ÑÐ°ÑÑÐ²Ð°Ð², ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 
%(returncode)s:\n%(stdout)s\n%(stderr)s
 
-#: ../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] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-06-27 Thread translation

commit 8f7b8efeec9acb6c64dca93f7a2ee030ecbcccbc
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:26 2015 +

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

diff --git a/uk/uk.po b/uk/uk.po
index e7147ec..0250dd7 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -12,8 +12,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2015-02-23 13:07+0100\n
-PO-Revision-Date: 2015-03-20 23:00+\n
+POT-Creation-Date: 2015-05-02 21:08+0200\n
+PO-Revision-Date: 2015-06-27 16:26+\n
 Last-Translator: LinuxChata\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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

2015-06-27 Thread translation

commit aabbf47a47884bf9488c88163378201d00dcce36
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:34 2015 +

Update translations for tails-greeter
---
 uk/uk.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index fed7b57..b7e69d8 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -5,14 +5,14 @@
 # Translators:
 # LinuxChata, 2014
 # ÐÐ½Ð´ÑÑÐ¹ ÐÐ°Ð½Ð´ÑÑÐ° andriykopanyt...@gmail.com, 2014
-# lyubomyr n.lyubo...@gmail.com, 2014
+# ÐÑÐ±Ð¾Ð¼Ð¸Ñ n.lyubo...@gmail.com, 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-31 14:31+\n
-Last-Translator: lyubomyr n.lyubo...@gmail.com\n
+POT-Creation-Date: 2014-10-15 16:05+0200\n
+PO-Revision-Date: 2015-06-27 16:37+\n
+Last-Translator: ÐÑÐ±Ð¾Ð¼Ð¸Ñ n.lyubo...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -199,7 +199,7 @@ msgid 
 %(stderr)s
 msgstr live-persist Ð½Ðµ ÑÐ¿ÑÐ°ÑÑÐ²Ð°Ð², ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 
%(returncode)s:\n%(stdout)s\n%(stderr)s
 
-#: ../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] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2015-06-27 Thread translation

commit d240f3683d201ba47f720c6ca287e3f03837d388
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:30 2015 +

Update translations for tails-persistence-setup_completed
---
 uk/uk.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index e7147ec..0250dd7 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -12,8 +12,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2015-02-23 13:07+0100\n
-PO-Revision-Date: 2015-03-20 23:00+\n
+POT-Creation-Date: 2015-05-02 21:08+0200\n
+PO-Revision-Date: 2015-06-27 16:26+\n
 Last-Translator: LinuxChata\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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/bridgedb] Update translations for bridgedb

2015-06-27 Thread translation

commit 2b83fb51445001f3daed2262677d11a550b8ab7d
Author: Translation commit bot translat...@torproject.org
Date:   Sat Jun 27 16:45:03 2015 +

Update translations for bridgedb
---
 uk/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index bd2e996..2d29529 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,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'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-19 08:23+\n
+PO-Revision-Date: 2015-06-27 16:37+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Ukrainian 
(http://www.transifex.com/projects/p/torproject/language/uk/)\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/master] Fix some compilation issues.

2015-06-27 Thread nickm

commit 229bb7e50f1df1953f07f9447cf2634166745431
Author: Nick Mathewson ni...@torproject.org
Date:   Sat Jun 27 14:27:00 2015 -0400

Fix some compilation issues.
---
 src/common/compat.c  |4 ++--
 src/ext/include.am   |2 +-
 src/ext/readpassphrase.h |   46 --
 src/ext/tor_readpassphrase.h |   46 ++
 4 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 91d117d..74de9a5 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -70,7 +70,7 @@
 #ifdef HAVE_READPASSPHRASE_H
 #include readpassphrase.h
 #elif !defined(_WIN32)
-#include readpassphrase.h
+#include tor_readpassphrase.h
 #else
 #include conio.h
 #endif
@@ -1650,7 +1650,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
   }
   /* Set the current limit value so if the attempt to set the limit to the
* max fails at least we'll have a valid value of maximum sockets. */
-  max_sockets = rlim.rlim_cur - ULIMIT_BUFFER;
+  max_sockets = (int)rlim.rlim_cur - ULIMIT_BUFFER;
   rlim.rlim_cur = rlim.rlim_max;
 
   if (setrlimit(RLIMIT_NOFILE, rlim) != 0) {
diff --git a/src/ext/include.am b/src/ext/include.am
index f0bfbb7..40923aa 100644
--- a/src/ext/include.am
+++ b/src/ext/include.am
@@ -7,7 +7,7 @@ EXTHEADERS = \
   src/ext/ht.h \
   src/ext/eventdns.h   \
   src/ext/tinytest.h   \
-  src/ext/readpassphrase.h \
+  src/ext/tor_readpassphrase.h \
   src/ext/strlcat.c\
   src/ext/strlcpy.c\
   src/ext/tinytest_macros.h \
diff --git a/src/ext/readpassphrase.h b/src/ext/readpassphrase.h
deleted file mode 100644
index 83ae1f2..000
--- a/src/ext/readpassphrase.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $  
*/
-
-/*
- * Copyright (c) 2000, 2002 Todd C. Miller todd.mil...@courtesan.com
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-/* OPENBSD ORIGINAL: include/readpassphrase.h */
-
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
-
-#include orconfig.h
-
-#ifndef HAVE_READPASSPHRASE
-
-#define RPP_ECHO_OFF0x00   /* Turn off echo (default). */
-#define RPP_ECHO_ON 0x01   /* Leave echo on. */
-#define RPP_REQUIRE_TTY 0x02   /* Fail if there is no tty. */
-#define RPP_FORCELOWER  0x04   /* Force input to lower case. */
-#define RPP_FORCEUPPER  0x08   /* Force input to upper case. */
-#define RPP_SEVENBIT0x10   /* Strip the high bit from input. */
-#define RPP_STDIN   0x20   /* Read from stdin, not /dev/tty */
-
-char * readpassphrase(const char *, char *, size_t, int);
-
-#define HAVE_READPASSPHRASE
-
-#endif /* HAVE_READPASSPHRASE */
-
-#endif /* !_READPASSPHRASE_H_ */
diff --git a/src/ext/tor_readpassphrase.h b/src/ext/tor_readpassphrase.h
new file mode 100644
index 000..83ae1f2
--- /dev/null
+++ b/src/ext/tor_readpassphrase.h
@@ -0,0 +1,46 @@
+/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $  
*/
+
+/*
+ * Copyright (c) 2000, 2002 Todd C. Miller todd.mil...@courtesan.com
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+
+/*

[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent

2015-06-27 Thread gk

commit 190904f3c647cbe5a394b1fb69d84d3b688bd40c
Author: Georg Koppen g...@torproject.org
Date:   Sat Jun 27 18:29:41 2015 +

fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
---
 dom/base/nsContentUtils.h |2 +-
 dom/events/KeyCodeConsensus.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index e8cb432..d4fff09 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -2401,7 +2401,7 @@ private:
   static bool sIsExperimentalAutocompleteEnabled;
   static bool sEncodeDecodeURLHash;
   static bool sPrivacyResistFingerprinting;
-  
+
   static nsHtml5StringParser* sHTMLFragmentParser;
   static nsIParser* sXMLFragmentParser;
   static nsIFragmentContentSink* sXMLFragmentSink;
diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h
index 8d66d19..5493c36 100644
--- a/dom/events/KeyCodeConsensus.h
+++ b/dom/events/KeyCodeConsensus.h
@@ -4,7 +4,7 @@
 // the numpad, right modifer keys, and any non-QWERTY US English keyboard.
 
 #include nsString.h
-#include nsClassHashTable.h
+#include nsDataHashtable.h
 
 // KEY_INTERNAL is called by KEY or SHIFT.
 #define KEY_INTERNAL(key, code, keyCode, shift)\

___
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] Using build2 of our ESR38 5.0 branch

2015-06-27 Thread gk

commit 80a40029330eeb1ec2205939fed853960762ae8c
Author: Georg Koppen g...@torproject.org
Date:   Sat Jun 27 18:55:44 2015 +

Using build2 of our ESR38 5.0 branch

build1 did not include a fixup for a Linux build bustage which was due
to the first version of the patch for #15646.
---
 gitian/versions.alpha |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e1937d0..3f94294 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,7 +8,7 @@ FIREFOX_VERSION=38.1.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2
 TOR_TAG=tor-0.2.7.1-alpha
 TORLAUNCHER_TAG=0.2.7.6
 TORBUTTON_TAG=1.9.3.0

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

[tor-commits] [tor-messenger-build/master] Disable Instantbird's auto-updater from source

2015-06-27 Thread sukhbir

commit f5290aedf786c69380650526ec1df18039ebf22d
Author: Sukhbir Singh sukh...@torproject.org
Date:   Sat Jun 27 15:06:20 2015 -0400

Disable Instantbird's auto-updater from source

Disable Instantbird's auto-update feature till we have Tor Messenger's
secure automatic updates architecture in place.
---
 projects/instantbird/mozconfig-linux-i686   |2 ++
 projects/instantbird/mozconfig-linux-x86_64 |2 ++
 projects/instantbird/mozconfig-osx-x86_64   |2 ++
 projects/instantbird/mozconfig-windows-i686 |2 ++
 4 files changed, 8 insertions(+)

diff --git a/projects/instantbird/mozconfig-linux-i686 
b/projects/instantbird/mozconfig-linux-i686
index 7bb9b61..f0f59cf 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -22,3 +22,5 @@ ac_add_options --with-l10n-base=..
 ac_add_options --host=i686-linux-gnu
 
 ac_add_options --with-branding=im/branding/messenger
+
+ac_add_options --disable-updater
diff --git a/projects/instantbird/mozconfig-linux-x86_64 
b/projects/instantbird/mozconfig-linux-x86_64
index 919b52e..d0333aa 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -18,3 +18,5 @@ ac_add_options --disable-debug
 ac_add_options --with-l10n-base=..
 
 ac_add_options --with-branding=im/branding/messenger
+
+ac_add_options --disable-updater
diff --git a/projects/instantbird/mozconfig-osx-x86_64 
b/projects/instantbird/mozconfig-osx-x86_64
index f624ec4..25af3cc 100644
--- a/projects/instantbird/mozconfig-osx-x86_64
+++ b/projects/instantbird/mozconfig-osx-x86_64
@@ -29,3 +29,5 @@ ac_add_options --disable-eme
 ac_add_options --with-l10n-base=..
 
 ac_add_options --with-branding=im/branding/messenger
+
+ac_add_options --disable-updater
diff --git a/projects/instantbird/mozconfig-windows-i686 
b/projects/instantbird/mozconfig-windows-i686
index f3c76c4..01dd873 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -28,3 +28,5 @@ ac_add_options --disable-tests
 ac_add_options --disable-signmar
 
 ac_add_options --with-branding=im/branding/messenger
+
+ac_add_options --disable-updater

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

[tor-commits] [nyx/master] Show microdescriptors in the descriptor popup

2015-06-27 Thread atagar

commit a40455b571d7585fbc501c276a18367393b85db3
Author: Damian Johnson ata...@torproject.org
Date:   Sat Jun 20 12:24:50 2015 -0700

Show microdescriptors in the descriptor popup

Our popup that shows relay descriptors only supported server descriptors and
the consensus since it predated microdescriptors. Including those if it's
available.
---
 nyx/connections/descriptor_popup.py |   51 ---
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/nyx/connections/descriptor_popup.py 
b/nyx/connections/descriptor_popup.py
index 0409ab8..144407a 100644
--- a/nyx/connections/descriptor_popup.py
+++ b/nyx/connections/descriptor_popup.py
@@ -16,9 +16,8 @@ from stem.util import str_tools
 
 LINE_NUM_COLOR = 'yellow'
 HEADER_COLOR = 'cyan'
-HEADER_PREFIX = ['ns/id/', 'desc/id/']
+HEADER_PREFIX = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:']
 
-SIG_COLOR = 'red'
 SIG_START_KEYS = ['-BEGIN RSA PUBLIC KEY-', '-BEGIN 
SIGNATURE-']
 SIG_END_KEYS = ['-END RSA PUBLIC KEY-', '-END SIGNATURE-']
 
@@ -58,7 +57,7 @@ def show_descriptor_popup(conn_panel):
   if fingerprint == 'UNKNOWN':
 fingerprint = None
 
-  display_text = get_display_text(fingerprint)
+  display_text = _display_text(fingerprint)
   display_color = 
nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
   show_line_number = fingerprint is not None
 
@@ -92,10 +91,11 @@ def show_descriptor_popup(conn_panel):
 scroll, is_changed = new_scroll, True
 elif key.is_selection() or key.match('d'):
   is_done = True  # closes popup
-elif key.match('left', 'right'):
-  # navigation - pass on to conn_panel and recreate popup
-
-  conn_panel.handle_key(panel.KeyInput(curses.KEY_UP) if 
key.match('left') else panel.KeyInput(curses.KEY_DOWN))
+elif key.match('left'):
+  conn_panel.handle_key(panel.KeyInput(curses.KEY_UP))
+  break
+elif key.match('right'):
+  conn_panel.handle_key(panel.KeyInput(curses.KEY_DOWN))
   break
   finally:
 conn_panel.set_title_visible(True)
@@ -103,34 +103,32 @@ def show_descriptor_popup(conn_panel):
 panel.CURSES_LOCK.release()
 
 
-def get_display_text(fingerprint):
+def _display_text(fingerprint):
   
-  Provides the descriptor and consensus entry for a relay. This is a list of
-  lines to be displayed by the dialog.
+  Provides the descriptors for a relay.
+
+  :param str fingerprint: relay fingerprint to be looked up
+
+  :returns: **list** with the lines that should be displayed in the dialog
   
 
   if not fingerprint:
 return [UNRESOLVED_MSG]
 
-  controller, description = tor_controller(), []
+  controller = tor_controller()
+  router_status_entry = controller.get_network_status(fingerprint, None)
+  microdescriptor = controller.get_microdescriptor(fingerprint, None)
+  server_descriptor = controller.get_server_descriptor(fingerprint, None)
 
-  description.append('ns/id/%s' % fingerprint)
-  consensus_entry = controller.get_info('ns/id/%s' % fingerprint, None)
+  description = 'Consensus:\n\n%s' % (router_status_entry if 
router_status_entry else ERROR_MSG)
 
-  if consensus_entry:
-description += consensus_entry.split('\n')
-  else:
-description += [ERROR_MSG, '']
-
-  description.append('desc/id/%s' % fingerprint)
-  descriptor_entry = controller.get_info('desc/id/%s' % fingerprint, None)
+  if server_descriptor:
+description += '\n\nServer Descriptor:\n\n%s' % server_descriptor
 
-  if descriptor_entry:
-description += descriptor_entry.split('\n')
-  else:
-description += [ERROR_MSG]
+  if microdescriptor:
+description += '\n\nMicrodescriptor:\n\n%s' % microdescriptor
 
-  return description
+  return description.split('\n')
 
 
 def get_preferred_size(text, max_width, show_line_number):
@@ -208,14 +206,11 @@ def draw(popup, fingerprint, display_text, display_color, 
scroll, show_line_numb
 elif line_text in SIG_START_KEYS:
   keyword, value = line_text, ''
   is_encryption_block = True
-  draw_format = SIG_COLOR
 elif line_text in SIG_END_KEYS:
   keyword, value = line_text, ''
   is_encryption_block = False
-  draw_format = SIG_COLOR
 elif is_encryption_block:
   keyword, value = '', line_text
-  draw_format = SIG_COLOR
 elif ' ' in line_text:
   div_index = line_text.find(' ')
   keyword, value = line_text[:div_index], line_text[div_index:]



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

[tor-commits] [nyx/master] Potential stacktrace when shutting down

2015-06-27 Thread atagar

commit 829da61b9494941e27fae17bf9aa35239fa0ddff
Author: Damian Johnson ata...@torproject.org
Date:   Sun Jun 21 11:13:13 2015 -0700

Potential stacktrace when shutting down

Our connection panel was missing a default value, causing exceptions to
possibly be uncaught...

  Traceback (most recent call last):
  File /usr/lib/python2.7/threading.py, line 551, in __bootstrap_inner
self.run()
  File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 352, 
in run
self._update()
  File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 508, 
in _update
for circ in tor_controller().get_circuits():
  File /home/atagar/Desktop/nyx/stem/control.py, line 411, in wrapped
return func(self, *args, **kwargs)
  File /home/atagar/Desktop/nyx/stem/control.py, line 3050, in 
get_circuits
response = self.get_info('circuit-status')
  File /home/atagar/Desktop/nyx/stem/control.py, line 558, in msg
self._socket.send(message)
  File /home/atagar/Desktop/nyx/stem/socket.py, line 122, in send
raise stem.SocketClosed()
---
 nyx/connections/conn_panel.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py
index 46c4a7c..fe41507 100644
--- a/nyx/connections/conn_panel.py
+++ b/nyx/connections/conn_panel.py
@@ -505,7 +505,7 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 new_connections = [(conn.local_address, conn.local_port, 
conn.remote_address, conn.remote_port) for conn in conn_resolver.get_value()]
 new_circuits = {}
 
-for circ in tor_controller().get_circuits():
+for circ in tor_controller().get_circuits([]):
   # Skips established single-hop circuits (these are for directory
   # fetches, not client circuits)
 



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

[tor-commits] [nyx/master] Stacktrace when showing connection panel's count dialog

2015-06-27 Thread atagar

commit 5969f127efef63cde02fcfe4b2617ee741b638c7
Author: Damian Johnson ata...@torproject.org
Date:   Mon Jun 8 08:33:08 2015 -0700

Stacktrace when showing connection panel's count dialog

Simple error when pressing 'c' on the connection panel...

  Traceback (most recent call last):
File ./run_nyx, line 8, in module
  nyx.main()
File /home/atagar/Desktop/nyx/nyx/__init__.py, line 30, in main
  nyx.starter.main()
File /home/atagar/Desktop/nyx/stem/util/conf.py, line 288, in wrapped
  return func(*args, config = config, **kwargs)
File /home/atagar/Desktop/nyx/nyx/starter.py, line 91, in main
  curses.wrapper(nyx.controller.start_nyx)
File /usr/lib/python2.7/curses/wrapper.py, line 43, in wrapper
  return func(stdscr, *args, **kwds)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 625, in 
start_nyx
  is_keystroke_consumed = panel_impl.handle_key(key)
File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 
316, in handle_key
  elif key.match('c') and self.is_clients_allowed():
File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 
218, in is_clients_allowed
  my_fingerprint = self.get_info('fingerprint', None)
  AttributeError: 'ConnectionPanel' object has no attribute 'get_info'
---
 nyx/connections/conn_panel.py |   33 -
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py
index 786cf9c..290cc84 100644
--- a/nyx/connections/conn_panel.py
+++ b/nyx/connections/conn_panel.py
@@ -137,12 +137,7 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 
 
 self._is_tor_running = event_type in (State.INIT, State.RESET)
-
-if self._is_tor_running:
-  self._halt_time = None
-else:
-  self._halt_time = time.time()
-
+self._halt_time = None if self._is_tor_running else time.time()
 self.redraw(True)
 
   def get_pause_time(self):
@@ -220,10 +215,10 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 controller = tor_controller()
 
 my_flags = []
-my_fingerprint = self.get_info('fingerprint', None)
+my_fingerprint = controller.get_info('fingerprint', None)
 
 if my_fingerprint:
-  my_status_entry = self.controller.get_network_status(my_fingerprint)
+  my_status_entry = controller.get_network_status(my_fingerprint)
 
   if my_status_entry:
 my_flags = my_status_entry.flags
@@ -338,9 +333,9 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 # run during nyx's interface initialization (otherwise there's a
 # noticeable pause before the first redraw).
 
-self._cond.acquire()
-self._cond.wait(0.2)
-self._cond.release()
+with self._cond:
+  self._cond.wait(0.2)
+
 self._update() # populates initial entries
 self._resolve_apps(False)  # resolves initial applications
 
@@ -348,12 +343,9 @@ class ConnectionPanel(panel.Panel, threading.Thread):
   current_time = time.time()
 
   if self.is_paused() or not self._is_tor_running or current_time - 
last_draw  CONFIG['features.connection.refreshRate']:
-self._cond.acquire()
-
-if not self._halt:
-  self._cond.wait(0.2)
-
-self._cond.release()
+with self._cond:
+  if not self._halt:
+self._cond.wait(0.2)
   else:
 # updates content if their's new results, otherwise just redraws
 
@@ -483,10 +475,9 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 Halts further resolutions and terminates the thread.
 
 
-self._cond.acquire()
-self._halt = True
-self._cond.notifyAll()
-self._cond.release()
+with self._cond:
+  self._halt = True
+  self._cond.notifyAll()
 
   def _update(self):
 



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

[tor-commits] [nyx/master] Errors when rendering connection panel entry

2015-06-27 Thread atagar

commit 91cff237a45cb9aa7d1aae53017627dc6e267083
Author: Damian Johnson ata...@torproject.org
Date:   Mon Jun 8 09:22:23 2015 -0700

Errors when rendering connection panel entry

Stacktraces related to how we handle curses attributes on the connection
panel. This arose if you tried to view the panel when there was... well,
anything on it (usually if you disable DisableDebuggerAttachment).

  Traceback (most recent call last):
File ./run_nyx, line 8, in module
  nyx.main()
File /home/atagar/Desktop/nyx/nyx/__init__.py, line 30, in main
  nyx.starter.main()
File /home/atagar/Desktop/nyx/stem/util/conf.py, line 288, in wrapped
  return func(*args, config = config, **kwargs)
File /home/atagar/Desktop/nyx/nyx/starter.py, line 91, in main
  curses.wrapper(nyx.controller.start_nyx)
File /usr/lib/python2.7/curses/wrapper.py, line 43, in wrapper
  return func(stdscr, *args, **kwds)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 576, in 
start_nyx
  control.redraw(False)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 402, in redraw
  panel_impl.redraw(force)
File /home/atagar/Desktop/nyx/nyx/util/panel.py, line 433, in redraw
  self.draw(self.max_x, self.max_y)
File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 
464, in draw
  attr |= extra_format
  TypeError: unsupported operand type(s) for |=: 'str' and 'int'

  Traceback (most recent call last):
File ./run_nyx, line 8, in module
  nyx.main()
File /home/atagar/Desktop/nyx/nyx/__init__.py, line 30, in main
  nyx.starter.main()
File /home/atagar/Desktop/nyx/stem/util/conf.py, line 288, in wrapped
  return func(*args, config = config, **kwargs)
File /home/atagar/Desktop/nyx/nyx/starter.py, line 91, in main
  curses.wrapper(nyx.controller.start_nyx)
File /usr/lib/python2.7/curses/wrapper.py, line 43, in wrapper
  return func(stdscr, *args, **kwds)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 576, in 
start_nyx
  control.redraw(False)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 402, in redraw
  panel_impl.redraw(force)
File /home/atagar/Desktop/nyx/nyx/util/panel.py, line 433, in redraw
  self.draw(self.max_x, self.max_y)
File /home/atagar/Desktop/nyx/nyx/connections/conn_panel.py, line 
463, in draw
  for msg, attr in draw_entry:
  ValueError: too many values to unpack
---
 nyx/connections/circ_entry.py |4 +++-
 nyx/connections/conn_entry.py |6 --
 nyx/connections/conn_panel.py |2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nyx/connections/circ_entry.py b/nyx/connections/circ_entry.py
index b3738c1..b3dc113 100644
--- a/nyx/connections/circ_entry.py
+++ b/nyx/connections/circ_entry.py
@@ -10,6 +10,8 @@ followed by an entry for each hop in the circuit. For 
instance:
 
 import curses
 
+import nyx.util.ui_tools
+
 from nyx.connections import entries, conn_entry
 from nyx.util import tor_controller
 
@@ -172,7 +174,7 @@ class CircLine(conn_entry.ConnectionLine):
 return entries.ConnectionPanelLine.get_listing_entry(self, width, 
current_time, listing_type)
 
   def _get_listing_entry(self, width, current_time, listing_type):
-line_format = conn_entry.CATEGORY_COLOR[self.get_type()]
+line_format = 
nyx.util.ui_tools.get_color(conn_entry.CATEGORY_COLOR[self.get_type()])
 
 # The required widths are the sum of the following:
 # initial space (1 character)
diff --git a/nyx/connections/conn_entry.py b/nyx/connections/conn_entry.py
index cfd4fa3..714661e 100644
--- a/nyx/connections/conn_entry.py
+++ b/nyx/connections/conn_entry.py
@@ -6,6 +6,8 @@ Connection panel entries related to actual connections to or 
from the system
 import time
 import curses
 
+import nyx.util.ui_tools
+
 from nyx.util import tor_controller
 from nyx.connections import entries
 
@@ -374,14 +376,14 @@ class ConnectionLine(entries.ConnectionPanelLine):
 # category - type
 # postType - )   
 
-line_format = CATEGORY_COLOR[entry_type]
+line_format = nyx.util.ui_tools.get_color(CATEGORY_COLOR[entry_type])
 time_width = 6 if CONFIG['features.connection.markInitialConnections'] 
else 5
 
 draw_entry = [(' ', line_format),
   (self._get_listing_content(width - (12 + time_width) - 1, 
listing_type), line_format),
   (' ' * time_width, line_format),
   (' (', line_format),
-  (entry_type.upper(), line_format, curses.A_BOLD),
+  (entry_type.upper(), line_format | curses.A_BOLD),
   (')' + ' ' * (9 - len(entry_type)), line_format)]
 
 return draw_entry
diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py
index 290cc84..46c4a7c 100644
---

[tor-commits] [nyx/master] Rewrite descriptor dialog

2015-06-27 Thread atagar

commit 681ab618a52157f81a4b376eb8502f87851098a3
Merge: a610441 34be51e
Author: Damian Johnson ata...@torproject.org
Date:   Sat Jun 27 14:18:47 2015 -0700

Rewrite descriptor dialog

Replacing the connection panel's descriptor dialog (the subwindow you see 
when
pressing 'd'). Only functional change is that it now includes 
microdescriptor
information (whereas before it only had consensus and server descriptors).

 nyx/connections/circ_entry.py   |4 +-
 nyx/connections/conn_entry.py   |6 +-
 nyx/connections/conn_panel.py   |   62 +---
 nyx/connections/descriptor_popup.py |  301 ---
 nyx/popups.py   |   19 ++-
 5 files changed, 157 insertions(+), 235 deletions(-)

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

[tor-commits] [nyx/master] Revise size calculation for the descriptor dialog

2015-06-27 Thread atagar

commit bd1ddce03d743352d234aedc8c9c0bd9c87bd646
Author: Damian Johnson ata...@torproject.org
Date:   Sun Jun 21 11:28:02 2015 -0700

Revise size calculation for the descriptor dialog

Tidying up this helper. The way we accounted for the size of line wraps 
didn't
look right since it didn't account for additional content (line number,
framing) on the line we wrapped onto.

This still isn't quite right since it doesn't account for word breaks but
*shrug*, probably good enough in practice.
---
 nyx/connections/descriptor_popup.py |   36 +--
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/nyx/connections/descriptor_popup.py 
b/nyx/connections/descriptor_popup.py
index 144407a..7eeb9df 100644
--- a/nyx/connections/descriptor_popup.py
+++ b/nyx/connections/descriptor_popup.py
@@ -59,11 +59,11 @@ def show_descriptor_popup(conn_panel):
 
   display_text = _display_text(fingerprint)
   display_color = 
nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
-  show_line_number = fingerprint is not None
+  show_line_numbers = fingerprint is not None
 
   # determines the maximum popup size the display_text can fill
 
-  popup_height, popup_width = get_preferred_size(display_text, 
conn_panel.max_x, show_line_number)
+  popup_height, popup_width = _preferred_size(display_text, 
conn_panel.max_x, show_line_numbers)
 
   with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, 
height):
 if popup:
@@ -71,7 +71,7 @@ def show_descriptor_popup(conn_panel):
 
   while not is_done:
 if is_changed:
-  draw(popup, fingerprint, display_text, display_color, scroll, 
show_line_number)
+  draw(popup, fingerprint, display_text, display_color, scroll, 
show_line_numbers)
   is_changed = False
 
 key = control.key_input()
@@ -131,31 +131,29 @@ def _display_text(fingerprint):
   return description.split('\n')
 
 
-def get_preferred_size(text, max_width, show_line_number):
+def _preferred_size(text, max_width, show_line_numbers):
   
-  Provides the (height, width) tuple for the preferred size of the given text.
+  Provides the preferred dimensions of our dialog.
+
+  :param list text: lines of text to be shown
+  :param int max_width: maximum width the dialog can be
+  :param bool show_line_numbers: if we should leave room for line numbers
+
+  :returns: **tuple** of the preferred (height, width)
   
 
   width, height = 0, len(text) + 2
-  line_number_width = int(math.log10(len(text))) + 1
+  line_number_width = int(math.log10(len(text))) + 2 if show_line_numbers else 0
+  max_content_width = max_width - line_number_width - 4
 
   for line in text:
-# width includes content, line number field, and border
-
-line_width = len(line) + 5
-
-if show_line_number:
-  line_width += line_number_width
-
-width = max(width, line_width)
-
-# tracks number of extra lines that will be taken due to text wrap
-height += (line_width - 2) / max_width
+width = min(max_width, max(width, len(line) + line_number_width + 4))
+height += len(line) / max_content_width  # extra lines due to text wrap
 
   return (height, width)
 
 
-def draw(popup, fingerprint, display_text, display_color, scroll, 
show_line_number):
+def draw(popup, fingerprint, display_text, display_color, scroll, 
show_line_numbers):
   popup.win.erase()
   popup.win.box()
   x_offset = 2
@@ -186,7 +184,7 @@ def draw(popup, fingerprint, display_text, display_color, 
scroll, show_line_numb
 line_text = display_text[i].strip()
 x_offset = 2
 
-if show_line_number:
+if show_line_numbers:
   line_number_label = ('%%%ii' % line_number_width) % (i + 1)
 
   popup.addstr(draw_line, x_offset, line_number_label, curses.A_BOLD, 
LINE_NUM_COLOR)



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

[tor-commits] [nyx/master] Separate panel from descriptor dialog

2015-06-27 Thread atagar

commit 34be51ee6ea48f8d8e1c124063a7c6a02f890a79
Author: Damian Johnson ata...@torproject.org
Date:   Sat Jun 27 13:41:20 2015 -0700

Separate panel from descriptor dialog

Abstracting the connection panel from the function for showing a descriptor
dialog. This essentially moves the outer loop which handled connection panel
navigation where it belongs.
---
 nyx/connections/conn_panel.py   |   25 -
 nyx/connections/descriptor_popup.py |   96 ++-
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py
index fe41507..c555a38 100644
--- a/nyx/connections/conn_panel.py
+++ b/nyx/connections/conn_panel.py
@@ -311,8 +311,29 @@ class ConnectionPanel(panel.Panel, threading.Thread):
 if selection != -1:
   self.set_listing_type(options[selection])
   elif key.match('d'):
-# presents popup for raw consensus data
-descriptor_popup.show_descriptor_popup(self)
+self.set_title_visible(False)
+self.redraw(True)
+
+while True:
+  selection = self.get_selection()
+
+  if not selection:
+break
+
+  color = 
nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
+  fingerprint = None if selection.foreign.get_fingerprint() == 
'UNKNOWN' else selection.foreign.get_fingerprint()
+  is_close_key = lambda key: key.is_selection() or key.match('d') or 
key.match('left') or key.match('right')
+  key = descriptor_popup.show_descriptor_popup(fingerprint, color, 
self.max_x, is_close_key)
+
+  if not key or key.is_selection() or key.match('d'):
+break  # closes popup
+  elif key.match('left'):
+self.handle_key(panel.KeyInput(curses.KEY_UP))
+  elif key.match('right'):
+self.handle_key(panel.KeyInput(curses.KEY_DOWN))
+
+self.set_title_visible(True)
+self.redraw(True)
   elif key.match('c') and self.is_clients_allowed():
 count_popup.showCountDialog(count_popup.CountType.CLIENT_LOCALE, 
self._client_locale_usage)
   elif key.match('e') and self.is_exits_allowed():
diff --git a/nyx/connections/descriptor_popup.py 
b/nyx/connections/descriptor_popup.py
index 1d155c3..358784c 100644
--- a/nyx/connections/descriptor_popup.py
+++ b/nyx/connections/descriptor_popup.py
@@ -6,9 +6,8 @@ import math
 import curses
 
 import nyx.popups
-import nyx.connections.conn_entry
 
-from nyx.util import panel, tor_controller, ui_tools
+from nyx.util import tor_controller, ui_tools
 
 from stem.util import str_tools
 
@@ -22,70 +21,51 @@ UNRESOLVED_MSG = 'No consensus data available'
 ERROR_MSG = 'Unable to retrieve data'
 
 
-def show_descriptor_popup(conn_panel):
+def show_descriptor_popup(fingerprint, color, max_width, is_close_key):
   
-  Presents consensus descriptor in popup window with the following controls:
-  Up, Down, Page Up, Page Down - scroll descriptor
-  Right, Left - next / previous connection
-  Enter, Space, d, D - close popup
+  Provides a dialog showing the descriptors for a given relay.
 
-  Arguments:
-conn_panel - connection panel providing the dialog
+  :param str fingerprint: fingerprint of the relay to be shown
+  :param str color: text color of the dialog
+  :param int max_width: maximum width of the dialog
+  :param function is_close_key: method to indicate if a key should close the
+dialog or not
+
+  :returns: :class:`~nyx.util.panel.KeyInput` for the keyboard input that
+closed the dialog
   
 
-  # hides the title of the connection panel
+  if fingerprint:
+title = 'Consensus Descriptor:'
+lines = _display_text(fingerprint)
+show_line_numbers = True
+  else:
+title = 'Consensus Descriptor (%s):' % fingerprint
+lines = [UNRESOLVED_MSG]
+show_line_numbers = False
+
+  popup_height, popup_width = _preferred_size(lines, max_width, 
show_line_numbers)
 
-  conn_panel.set_title_visible(False)
-  conn_panel.redraw(True)
+  with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, 
height):
+if not popup:
+  return None
 
-  control = nyx.controller.get_controller()
+scroll, redraw = 0, True
 
-  with panel.CURSES_LOCK:
 while True:
-  selection = conn_panel.get_selection()
-
-  if not selection:
-break
-
-  fingerprint = selection.foreign.get_fingerprint()
-
-  if fingerprint == 'UNKNOWN':
-title = 'Consensus Descriptor (%s):' % fingerprint
-lines = [UNRESOLVED_MSG]
-show_line_numbers = False
-  else:
-title = 'Consensus Descriptor:'
-lines = _display_text(fingerprint)
-show_line_numbers = True
-
-  color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
-  popup_height, popup_width = _preferred_size(lines, conn_panel.max_x, 
show_line_numbers)
-
-  with nyx.popups.popup_window(popup_height, popup_width) as (popup, _,

[tor-commits] [nyx/master] Rewrite descriptor dialog's draw() method

2015-06-27 Thread atagar

commit 55166969f6caad16c080f3cbd85d9a372eb0cc90
Author: Damian Johnson ata...@torproject.org
Date:   Sat Jun 27 12:31:00 2015 -0700

Rewrite descriptor dialog's draw() method

Not quite done with the dialog, but damn its draw method is now better. :P
---
 nyx/connections/descriptor_popup.py |  194 ---
 nyx/popups.py   |   19 ++--
 2 files changed, 73 insertions(+), 140 deletions(-)

diff --git a/nyx/connections/descriptor_popup.py 
b/nyx/connections/descriptor_popup.py
index 7eeb9df..1d155c3 100644
--- a/nyx/connections/descriptor_popup.py
+++ b/nyx/connections/descriptor_popup.py
@@ -12,14 +12,11 @@ from nyx.util import panel, tor_controller, ui_tools
 
 from stem.util import str_tools
 
-# field keywords used to identify areas for coloring
-
-LINE_NUM_COLOR = 'yellow'
+HEADERS = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:']
 HEADER_COLOR = 'cyan'
-HEADER_PREFIX = ['Consensus:', 'Microdescriptor:', 'Server Descriptor:']
+LINE_NUMBER_COLOR = 'yellow'
 
-SIG_START_KEYS = ['-BEGIN RSA PUBLIC KEY-', '-BEGIN 
SIGNATURE-']
-SIG_END_KEYS = ['-END RSA PUBLIC KEY-', '-END SIGNATURE-']
+BLOCK_START, BLOCK_END = '-BEGIN ', '-END '
 
 UNRESOLVED_MSG = 'No consensus data available'
 ERROR_MSG = 'Unable to retrieve data'
@@ -42,11 +39,9 @@ def show_descriptor_popup(conn_panel):
   conn_panel.redraw(True)
 
   control = nyx.controller.get_controller()
-  panel.CURSES_LOCK.acquire()
-  is_done = False
 
-  try:
-while not is_done:
+  with panel.CURSES_LOCK:
+while True:
   selection = conn_panel.get_selection()
 
   if not selection:
@@ -55,52 +50,42 @@ def show_descriptor_popup(conn_panel):
   fingerprint = selection.foreign.get_fingerprint()
 
   if fingerprint == 'UNKNOWN':
-fingerprint = None
-
-  display_text = _display_text(fingerprint)
-  display_color = 
nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
-  show_line_numbers = fingerprint is not None
-
-  # determines the maximum popup size the display_text can fill
+title = 'Consensus Descriptor (%s):' % fingerprint
+lines = [UNRESOLVED_MSG]
+show_line_numbers = False
+  else:
+title = 'Consensus Descriptor:'
+lines = _display_text(fingerprint)
+show_line_numbers = True
 
-  popup_height, popup_width = _preferred_size(display_text, 
conn_panel.max_x, show_line_numbers)
+  color = nyx.connections.conn_entry.CATEGORY_COLOR[selection.get_type()]
+  popup_height, popup_width = _preferred_size(lines, conn_panel.max_x, 
show_line_numbers)
 
   with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, 
height):
 if popup:
-  scroll, is_changed = 0, True
-
-  while not is_done:
-if is_changed:
-  draw(popup, fingerprint, display_text, display_color, scroll, 
show_line_numbers)
-  is_changed = False
+  scroll = 0
+  _draw(popup, title, lines, color, scroll, show_line_numbers)
 
+  while True:
 key = control.key_input()
 
 if key.is_scroll():
-  # TODO: This is a bit buggy in that scrolling is by display_text
-  # lines rather than the displayed lines, causing issues when
-  # content wraps. The result is that we can't have a scrollbar and
-  # can't scroll to the bottom if there's a multi-line being
-  # displayed. However, trying to correct this introduces a big can
-  # of worms and after hours decided that this isn't worth the
-  # effort...
-
-  new_scroll = ui_tools.get_scroll_position(key, scroll, height - 
2, len(display_text))
+  new_scroll = ui_tools.get_scroll_position(key, scroll, height - 
2, len(lines))
 
   if scroll != new_scroll:
-scroll, is_changed = new_scroll, True
+scroll = new_scroll
+_draw(popup, title, lines, color, scroll, show_line_numbers)
 elif key.is_selection() or key.match('d'):
-  is_done = True  # closes popup
+  return  # closes popup
 elif key.match('left'):
   conn_panel.handle_key(panel.KeyInput(curses.KEY_UP))
   break
 elif key.match('right'):
   conn_panel.handle_key(panel.KeyInput(curses.KEY_DOWN))
   break
-  finally:
-conn_panel.set_title_visible(True)
-conn_panel.redraw(True)
-panel.CURSES_LOCK.release()
+
+  conn_panel.set_title_visible(True)
+  conn_panel.redraw(True)
 
 
 def _display_text(fingerprint):
@@ -112,9 +97,6 @@ def _display_text(fingerprint):
   :returns: **list** with the lines that should be displayed in the dialog
   
 
-  if not fingerprint:
-return [UNRESOLVED_MSG]
-
   controller = tor_controller()
   router_status_entry = controller.get_network_status(fingerprint,

[tor-commits] [nyx/master] Menus caused stacktrace when you pressed 'm'

2015-06-27 Thread atagar

commit 4de4e4ca8a719196b971e9e13ebc0f61b67123bb
Author: Damian Johnson ata...@torproject.org
Date:   Sat Jun 27 16:04:59 2015 -0700

Menus caused stacktrace when you pressed 'm'

Issue spotted by Steven. Revisions to popup handling broke the menu...

  Traceback (most recent call last):
File ./run_nyx, line 8, in module
  nyx.main()
File /home/atagar/Desktop/nyx/nyx/__init__.py, line 30, in main
  nyx.starter.main()
File /home/atagar/Desktop/nyx/stem/util/conf.py, line 288, in wrapped
  return func(*args, config = config, **kwargs)
File /home/atagar/Desktop/nyx/nyx/starter.py, line 91, in main
  curses.wrapper(nyx.controller.start_nyx)
File /usr/lib/python2.7/curses/wrapper.py, line 43, in wrapper
  return func(stdscr, *args, **kwds)
File /home/atagar/Desktop/nyx/nyx/controller.py, line 594, in 
start_nyx
  nyx.menu.menu.show_menu()
File /home/atagar/Desktop/nyx/nyx/menu/menu.py, line 119, in show_menu
  _draw_submenu(cursor, 1, 1, selection_left)
File /home/atagar/Desktop/nyx/nyx/menu/menu.py, line 159, in 
_draw_submenu
  popup, _, _ = nyx.popups.init(len(submenu.get_children()), 
menu_width, top, left, below_static = False)
  AttributeError: 'module' object has no attribute 'init'
---
 nyx/menu/menu.py |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py
index 34e9a67..ef36063 100644
--- a/nyx/menu/menu.py
+++ b/nyx/menu/menu.py
@@ -156,12 +156,10 @@ def _draw_submenu(cursor, level, top, left):
   label_format = ' %%-%is%%-%is%%-%is ' % (prefix_col_size, middle_col_size, 
suffix_col_size)
   menu_width = len(label_format % ('', '', ''))
 
-  popup, _, _ = nyx.popups.init(len(submenu.get_children()), menu_width, top, 
left, below_static = False)
+  with nyx.popups.popup_window(len(submenu.get_children()), menu_width, top, 
left, below_static = False) as (popup, _, _):
+if not popup:
+  return
 
-  if not popup:
-return
-
-  try:
 # sets the background color
 
 popup.win.bkgd(' ', curses.A_STANDOUT | ui_tools.get_color('red'))
@@ -183,5 +181,3 @@ def _draw_submenu(cursor, level, top, left):
 # shows the next submenu
 
 _draw_submenu(cursor, level + 1, top + selection_top, left + menu_width)
-  finally:
-nyx.popups.finalize()

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

[tor-commits] [websocket/master] Use new convention for Temporary errors from AcceptSocks.

2015-06-27 Thread dcf

commit 84b1f7529a6dde712d8aab297f247e4baee32d70
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:18:23 2015 -0700

Use new convention for Temporary errors from AcceptSocks.

https://trac.torproject.org/projects/tor/ticket/14135

https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=50b39b746c6ff34bf31977b658848d876ee84fbf
---
 pt-websocket-client/pt-websocket-client.go |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt-websocket-client/pt-websocket-client.go 
b/pt-websocket-client/pt-websocket-client.go
index fe38c9d..20d12bd 100644
--- a/pt-websocket-client/pt-websocket-client.go
+++ b/pt-websocket-client/pt-websocket-client.go
@@ -156,10 +156,10 @@ func socksAcceptLoop(ln *pt.SocksListener) error {
for {
socks, err := ln.AcceptSocks()
if err != nil {
-   if e, ok := err.(*net.OpError); ok  !e.Temporary() {
-   return err
+   if e, ok := err.(*net.OpError); ok  e.Temporary() {
+   continue
}
-   continue
+   return err
}
go func() {
err := handleConnection(socks)

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

[tor-commits] [tor/master] Whoops; fix linux build again

2015-06-27 Thread nickm

commit f491aed8d03810271f800a04ed1d5f9e76f5af1f
Author: Nick Mathewson ni...@torproject.org
Date:   Sat Jun 27 22:41:39 2015 -0400

Whoops; fix linux build again
---
 src/ext/readpassphrase.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ext/readpassphrase.c b/src/ext/readpassphrase.c
index 7bdecaf..ab71935 100644
--- a/src/ext/readpassphrase.c
+++ b/src/ext/readpassphrase.c
@@ -30,7 +30,7 @@
 #include signal.h
 #include ctype.h
 #include fcntl.h
-#include readpassphrase.h
+#include tor_readpassphrase.h
 #include errno.h
 #include string.h
 #include unistd.h

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

[tor-commits] [meek/master] Use the new TOR_PT_PROXY interface from #12125.

2015-06-27 Thread dcf

commit eafbc1d735f8980180bf8d3afb57440470a537c7
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jun 24 13:48:38 2015 -0700

Use the new TOR_PT_PROXY interface from #12125.
---
 meek-client/meek-client.go |   17 --
 meek-client/proxy.go   |   52 
 meek-client/proxy_test.go  |   81 
 3 files changed, 6 insertions(+), 144 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 7ac6eae..6198d37 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -389,8 +389,8 @@ func main() {
 
// We make a copy of DefaultTransport because we want the default Dial
// and TLSHandshakeTimeout settings. But we want to disable the default
-   // ProxyFromEnvironment setting. Proxy is overridden below if proxyURL
-   // is set.
+   // ProxyFromEnvironment setting. Proxy is overridden below if
+   // options.ProxyURL is set.
httpTransport = *http.DefaultTransport.(*http.Transport)
httpTransport.Proxy = nil
 
@@ -398,27 +398,22 @@ func main() {
if err != nil {
log.Fatalf(error in ClientSetup: %s, err)
}
-   ptProxyURL, err := PtGetProxyURL()
-   if err != nil {
-   PtProxyError(err.Error())
-   log.Fatalf(can't get managed proxy configuration: %s, err)
-   }
 
// Command-line proxy overrides managed configuration.
if options.ProxyURL == nil {
-   options.ProxyURL = ptProxyURL
+   options.ProxyURL = ptInfo.ProxyURL
}
// Check whether we support this kind of proxy.
if options.ProxyURL != nil {
err = checkProxyURL(options.ProxyURL)
if err != nil {
-   PtProxyError(err.Error())
+   pt.ProxyError(err.Error())
log.Fatal(fmt.Sprintf(proxy error: %s, err))
}
log.Printf(using proxy %s, options.ProxyURL.String())
httpTransport.Proxy = http.ProxyURL(options.ProxyURL)
-   if ptProxyURL != nil {
-   PtProxyDone()
+   if ptInfo.ProxyURL != nil {
+   pt.ProxyDone()
}
}
 
diff --git a/meek-client/proxy.go b/meek-client/proxy.go
deleted file mode 100644
index 9b7f27d..000
--- a/meek-client/proxy.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
-   fmt
-   net/url
-   os
-)
-
-import git.torproject.org/pluggable-transports/goptlib.git
-
-// The code in this file has to do with configuring an upstream proxy, whether
-// through the command line or the managed interface of proposal 232
-// (TOR_PT_PROXY).
-//
-// 
https://gitweb.torproject.org/torspec.git/tree/proposals/232-pluggable-transports-through-proxy.txt
-
-// Get the upstream proxy URL. Returns nil if no proxy is requested. The
-// function ensures that the Scheme and Host fields are set; i.e., that the URL
-// is absolute. This function reads the environment variable TOR_PT_PROXY.
-//
-// This function doesn't check that the scheme is one of Tor's supported proxy
-// schemes; that is, one of http, socks5, or socks4a. The caller must be
-// able to handle any returned scheme (which may be by calling PtProxyError if
-// it doesn't know how to handle the scheme).
-func PtGetProxyURL() (*url.URL, error) {
-   rawurl := os.Getenv(TOR_PT_PROXY)
-   if rawurl ==  {
-   return nil, nil
-   }
-   u, err := url.Parse(rawurl)
-   if err != nil {
-   return nil, err
-   }
-   if u.Scheme ==  {
-   return nil, fmt.Errorf(missing scheme)
-   }
-   if u.Host ==  {
-   return nil, fmt.Errorf(missing host)
-   }
-   return u, nil
-}
-
-// Emit a PROXY-ERROR line with explanation text.
-func PtProxyError(msg string) {
-   fmt.Fprintf(pt.Stdout, PROXY-ERROR %s\n, msg)
-}
-
-// Emit a PROXY DONE line. Call this after parsing the return value of
-// PtGetProxyURL.
-func PtProxyDone() {
-   fmt.Fprintf(pt.Stdout, PROXY DONE\n)
-}
diff --git a/meek-client/proxy_test.go b/meek-client/proxy_test.go
deleted file mode 100644
index 77123b9..000
--- a/meek-client/proxy_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package main
-
-import (
-   os
-   testing
-)
-
-func TestGetProxyURL(t *testing.T) {
-   badTests := [...]string{
-   bogus,
-   http:,
-   ://127.0.0.1,
-   //127.0.0.1,
-   http:127.0.0.1,
-   ://[::1],
-   //[::1],
-   http:[::1],
-   ://localhost,
-   //localhost,
-   http:localhost,
-   }
-   goodTests := [...]struct {
-   input, expected string
-   }{
-   {http://127.0.0.1;, http://127.0.0.1},
-   {http://127.0.0.1:8080;,

[tor-commits] [goptlib/master] Add support for TOR_PT_PROXY.

2015-06-27 Thread dcf

commit d433318f1635b9d14b29236df7556cb42378932b
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jun 24 13:25:06 2015 -0700

Add support for TOR_PT_PROXY.

https://trac.torproject.org/projects/tor/ticket/12125

Adds two new functions:
ProxyError
ProxyDone
and one new member to ClientInfo:
ProxyURL *url.URL
---
 examples/dummy-client/dummy-client.go |5 +++
 proxy_test.go |   80 +
 pt.go |   66 ++-
 3 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/examples/dummy-client/dummy-client.go 
b/examples/dummy-client/dummy-client.go
index cbb2d38..5d99b0c 100644
--- a/examples/dummy-client/dummy-client.go
+++ b/examples/dummy-client/dummy-client.go
@@ -88,6 +88,11 @@ func main() {
os.Exit(1)
}
 
+   if ptInfo.ProxyURL != nil {
+   pt.ProxyError(proxy is not supported)
+   os.Exit(1)
+   }
+
listeners := make([]net.Listener, 0)
for _, methodName := range ptInfo.MethodNames {
switch methodName {
diff --git a/proxy_test.go b/proxy_test.go
new file mode 100644
index 000..c7a113b
--- /dev/null
+++ b/proxy_test.go
@@ -0,0 +1,80 @@
+package pt
+
+import (
+   os
+   testing
+)
+
+func TestGetProxyURL(t *testing.T) {
+   badTests := [...]string{
+   bogus,
+   http:,
+   ://127.0.0.1,
+   //127.0.0.1,
+   http:127.0.0.1,
+   ://[::1],
+   //[::1],
+   http:[::1],
+   ://localhost,
+   //localhost,
+   http:localhost,
+   // No port in these.
+   http://127.0.0.1;,
+   socks4a://127.0.0.1,
+   socks5://127.0.0.1,
+   http://127.0.0.1:;,
+   http://[::1];,
+   http://localhost;,
+   unknown://localhost/whatever,
+   // No host in these.
+   http://:8080;,
+   socks4a://:1080,
+   socks5://:1080,
+   }
+   goodTests := [...]struct {
+   input, expected string
+   }{
+   {http://127.0.0.1:8080;, http://127.0.0.1:8080},
+   {http://127.0.0.1:8080/;, http://127.0.0.1:8080/},
+   {http://127.0.0.1:8080/path;, http://127.0.0.1:8080/path},
+   {http://[::1]:8080;, http://[::1]:8080},
+   {http://[::1]:8080/;, http://[::1]:8080/},
+   {http://[::1]:8080/path;, http://[::1]:8080/path},
+   {http://localhost:8080;, http://localhost:8080},
+   {http://localhost:8080/;, http://localhost:8080/},
+   {http://localhost:8080/path;, http://localhost:8080/path},
+   {http://user@localhost:8080;, http://user@localhost:8080},
+   {http://user:password@localhost:8080;, 
http://user:password@localhost:8080},
+   {socks5://localhost:1080, socks5://localhost:1080},
+   {socks4a://localhost:1080, socks4a://localhost:1080},
+   {unknown://localhost:/whatever, 
unknown://localhost:/whatever},
+   }
+
+   os.Clearenv()
+   u, err := getProxyURL()
+   if err != nil {
+   t.Errorf(empty environment unexpectedly returned an error: 
%s, err)
+   }
+   if u != nil {
+   t.Errorf(empty environment returned %q, u)
+   }
+
+   for _, input := range badTests {
+   os.Setenv(TOR_PT_PROXY, input)
+   u, err = getProxyURL()
+   if err == nil {
+   t.Errorf(TOR_PT_PROXY=%q unexpectedly succeeded and 
returned %q, input, u)
+   }
+   }
+
+   for _, test := range goodTests {
+   os.Setenv(TOR_PT_PROXY, test.input)
+   u, err := getProxyURL()
+   if err != nil {
+   t.Errorf(TOR_PT_PROXY=%q unexpectedly returned an 
error: %s, test.input, err)
+   }
+   if u == nil || u.String() != test.expected {
+   t.Errorf(TOR_PT_PROXY=%q â %q (expected %q), 
test.input, u, test.expected)
+   }
+   }
+}
diff --git a/pt.go b/pt.go
index d2e7dc1..fc2141e 100644
--- a/pt.go
+++ b/pt.go
@@ -39,6 +39,12 @@
 // if err != nil {
 // os.Exit(1)
 // }
+// if ptInfo.ProxyURL != nil {
+// // you need to interpret the proxy URL yourself
+// // call pt.ProxyDone instead if it's a type you 
understand
+// pt.ProxyError(proxy %s is not supported)
+// os.Exit(1)
+// }
 // for _, methodName := range ptInfo.MethodNames {
 // switch methodName {
 // case foo:
@@ -119,6 +125,9 @@
 // Extended ORPort

[tor-commits] [bundle/master] Update gitweb link.

2015-06-27 Thread dcf

commit 50f1e8f908927e9856be05c5f5d849a982fbdc14
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:21:13 2015 -0700

Update gitweb link.
---
 README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 7929644..1c8824b 100644
--- a/README
+++ b/README
@@ -3,4 +3,4 @@ bundles. It is no longer used since the 3.x series as pluggable
 transports used the same Gitian-based system as the rest of the bundle.
 
 You want
-https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gitian/README.build
+https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build

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

[tor-commits] [goptlib/master] Remove everything having to do with the * transport specification.

2015-06-27 Thread dcf

commit 65fc8d72eccd82237562744ddc85760d426561d8
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:48:25 2015 -0700

Remove everything having to do with the * transport specification.

It was never implemented and is no longer part of the specification:
https://trac.torproject.org/projects/tor/ticket/15612

The arguments to ClientSetup and ServerSetup that were solely to handle
* are now documented as unused.
---
 examples/dummy-client/dummy-client.go |2 +-
 examples/dummy-server/dummy-server.go |2 +-
 pt.go |   60 +-
 pt_test.go|  108 +
 4 files changed, 61 insertions(+), 111 deletions(-)

diff --git a/examples/dummy-client/dummy-client.go 
b/examples/dummy-client/dummy-client.go
index 045a8f2..74843fd 100644
--- a/examples/dummy-client/dummy-client.go
+++ b/examples/dummy-client/dummy-client.go
@@ -83,7 +83,7 @@ func acceptLoop(ln *pt.SocksListener) error {
 func main() {
var err error
 
-   ptInfo, err = pt.ClientSetup([]string{dummy})
+   ptInfo, err = pt.ClientSetup(nil)
if err != nil {
os.Exit(1)
}
diff --git a/examples/dummy-server/dummy-server.go 
b/examples/dummy-server/dummy-server.go
index 70251ea..933630b 100644
--- a/examples/dummy-server/dummy-server.go
+++ b/examples/dummy-server/dummy-server.go
@@ -80,7 +80,7 @@ func acceptLoop(ln net.Listener) error {
 func main() {
var err error
 
-   ptInfo, err = pt.ServerSetup([]string{dummy})
+   ptInfo, err = pt.ServerSetup(nil)
if err != nil {
os.Exit(1)
}
diff --git a/pt.go b/pt.go
index a8c815e..d2aedca 100644
--- a/pt.go
+++ b/pt.go
@@ -35,7 +35,7 @@
 // ...
 // func main() {
 // var err error
-// ptInfo, err = pt.ClientSetup([]string{foo})
+// ptInfo, err = pt.ClientSetup(nil)
 // if err != nil {
 // os.Exit(1)
 // }
@@ -92,7 +92,7 @@
 // ...
 // func main() {
 // var err error
-// ptInfo, err = pt.ServerSetup([]string{foo})
+// ptInfo, err = pt.ServerSetup(nil)
 // if err != nil {
 // os.Exit(1)
 // }
@@ -377,17 +377,13 @@ func MakeStateDir() (string, error) {
return dir, err
 }
 
-// Get the intersection of the method names offered by Tor and those in
-// methodNames. This function reads the environment variable
-// TOR_PT_CLIENT_TRANSPORTS.
-func getClientTransports(star []string) ([]string, error) {
+// Get the list of method names requested by Tor. This function reads the
+// environment variable TOR_PT_CLIENT_TRANSPORTS.
+func getClientTransports() ([]string, error) {
clientTransports, err := getenvRequired(TOR_PT_CLIENT_TRANSPORTS)
if err != nil {
return nil, err
}
-   if clientTransports == * {
-   return star, nil
-   }
return strings.Split(clientTransports, ,), nil
 }
 
@@ -436,9 +432,8 @@ type ClientInfo struct {
 }
 
 // Check the client pluggable transports environment, emitting an error message
-// and returning a non-nil error if any error is encountered. star is the list
-// of method names to use in case * is requested by Tor. Returns a ClientInfo
-// struct.
+// and returning a non-nil error if any error is encountered. Returns a
+// ClientInfo struct.
 //
 // If your program needs to know whether to call ClientSetup or ServerSetup
 // (i.e., if the same program can be run as either a client or a server), check
@@ -448,14 +443,20 @@ type ClientInfo struct {
 // } else {
 // // Server mode; call pt.ServerSetup.
 // }
-func ClientSetup(star []string) (info ClientInfo, err error) {
+//
+// Always pass nil for the unused single parameter. In the past, the parameter
+// was a list of transport names to use in case Tor requested *. That feature
+// was never implemented and has been removed from the pluggable transports
+// specification.
+// https://trac.torproject.org/projects/tor/ticket/15612
+func ClientSetup(_ []string) (info ClientInfo, err error) {
ver, err := getManagedTransportVer()
if err != nil {
return
}
line(VERSION, ver)
 
-   info.MethodNames, err = getClientTransports(star)
+   info.MethodNames, err = getClientTransports()
if err != nil {
return
}
@@ -537,11 +538,9 @@ func filterBindaddrs(addrs []Bindaddr, methodNames 
[]string) []Bindaddr {
 }
 
 // Return an array of Bindaddrs, being the contents of TOR_PT_SERVER_BINDADDR
-// with keys filtered by TOR_PT_SERVER_TRANSPORTS. If TOR_PT_SERVER_TRANSPORTS
-// is *, then keys are filtered by the entries in star instead.
-// Transport-specific options from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned
-// to the Options member.
-func getServerBindaddrs(star []string)

[tor-commits] [goptlib/master] Don't report errors that are not caused by Accept in AcceptSocks.

2015-06-27 Thread dcf

commit 50b39b746c6ff34bf31977b658848d876ee84fbf
Author: David Fifield da...@bamsoftware.com
Date:   Wed Jun 24 01:58:25 2015 -0700

Don't report errors that are not caused by Accept in AcceptSocks.

This means that anything that is not a net.Error, or is a net.Error but
is not Temporary, should be considered to be a permanent error by the
caller. Sample code now shows the new error-checking convention.
Previously, we used the convention that a non-net.Error should be
considered temporary, because it could have been caused by a failed
SOCKS negotiation, for example. Now those errors are simply not returned
to the caller. See https://trac.torproject.org/projects/tor/ticket/14135.

In summary, previous behavior is this:
net.Error, Temporary: caller should try again
net.Error, non-Temporary: caller should quit
other errors: caller should try again
It is now this:
net.Error, Temporary: caller should try again
net.Error, non-Temporary: caller should quit
other errors: caller should quit
But now the other errors such as those caused by a bad SOCKS
negotiation will not be reported by AcceptSocks.

The practical effect of this change is almost nil; even if callers don't
update their error-checking code, the only change is in the other
errors that don't arise in normal use.
---
 examples/dummy-client/dummy-client.go |6 +++---
 examples/dummy-server/dummy-server.go |6 +++---
 pt.go |   12 ++--
 socks.go  |   23 ---
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/examples/dummy-client/dummy-client.go 
b/examples/dummy-client/dummy-client.go
index 5d99b0c..045a8f2 100644
--- a/examples/dummy-client/dummy-client.go
+++ b/examples/dummy-client/dummy-client.go
@@ -71,10 +71,10 @@ func acceptLoop(ln *pt.SocksListener) error {
for {
conn, err := ln.AcceptSocks()
if err != nil {
-   if e, ok := err.(net.Error); ok  !e.Temporary() {
-   return err
+   if e, ok := err.(net.Error); ok  e.Temporary() {
+   continue
}
-   continue
+   return err
}
go handler(conn)
}
diff --git a/examples/dummy-server/dummy-server.go 
b/examples/dummy-server/dummy-server.go
index ea91be9..70251ea 100644
--- a/examples/dummy-server/dummy-server.go
+++ b/examples/dummy-server/dummy-server.go
@@ -68,10 +68,10 @@ func acceptLoop(ln net.Listener) error {
for {
conn, err := ln.Accept()
if err != nil {
-   if e, ok := err.(net.Error); ok  !e.Temporary() {
-   return err
+   if e, ok := err.(net.Error); ok  e.Temporary() {
+   continue
}
-   continue
+   return err
}
go handler(conn)
}
diff --git a/pt.go b/pt.go
index fc2141e..a8c815e 100644
--- a/pt.go
+++ b/pt.go
@@ -23,10 +23,10 @@
 // for {
 // conn, err := ln.AcceptSocks()
 // if err != nil {
-// if e, ok := err.(net.Error); ok  
!e.Temporary() {
-// return err
+// if e, ok := err.(net.Error); ok  
e.Temporary() {
+// continue
 // }
-// continue
+// return err
 // }
 // go handler(conn)
 // }
@@ -80,10 +80,10 @@
 // for {
 // conn, err := ln.Accept()
 // if err != nil {
-// if e, ok := err.(net.Error); ok  
!e.Temporary() {
-// return err
+// if e, ok := err.(net.Error); ok  
e.Temporary() {
+// continue
 // }
-// continue
+// return err
 // }
 // go handler(conn)
 // }
diff --git a/socks.go b/socks.go
index eba318b..9a764b8 100644
--- a/socks.go
+++ b/socks.go
@@ -73,10 +73,10 @@ func (conn *SocksConn) Reject() error {
 // conn, err := ln.AcceptSocks()
 // if err != nil {
 // log.Printf(accept error: %s, err)
-// if e, ok := err.(net.Error); ok  !e.Temporary() {
-// break
+// if e, ok := err.(net.Error); ok  e.Temporary() {
+//

[tor-commits] [goptlib/master] Fix misnamed struct member.

2015-06-27 Thread dcf

commit fb1c7123e1c3daf1453ff474ed32e25c74d58bfb
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:43:48 2015 -0700

Fix misnamed struct member.
---
 pt_test.go |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_test.go b/pt_test.go
index c0540b5..8470383 100644
--- a/pt_test.go
+++ b/pt_test.go
@@ -138,9 +138,9 @@ func tcpAddrsEqual(a, b *net.TCPAddr) bool {
 
 func TestGetClientTransports(t *testing.T) {
tests := [...]struct {
-   ptServerClientTransports string
-   star []string
-   expected []string
+   ptClientTransports string
+   star   []string
+   expected   []string
}{
{
*,
@@ -205,15 +205,15 @@ func TestGetClientTransports(t *testing.T) {
}
 
for _, test := range tests {
-   os.Setenv(TOR_PT_CLIENT_TRANSPORTS, 
test.ptServerClientTransports)
+   os.Setenv(TOR_PT_CLIENT_TRANSPORTS, test.ptClientTransports)
output, err := getClientTransports(test.star)
if err != nil {
t.Errorf(TOR_PT_CLIENT_TRANSPORTS=%q unexpectedly 
returned an error: %s,
-   test.ptServerClientTransports, err)
+   test.ptClientTransports, err)
}
if !stringSetsEqual(output, test.expected) {
t.Errorf(TOR_PT_CLIENT_TRANSPORTS=%q %q â %q 
(expected %q),
-   test.ptServerClientTransports, test.star, 
output, test.expected)
+   test.ptClientTransports, test.star, output, 
test.expected)
}
}
 }



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

[tor-commits] [websocket/master] Pass nil to ClientSetup and ServerSetup as now documented.

2015-06-27 Thread dcf

commit c5b5f713533771222cf7844a112630989ec6eca5
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:55:11 2015 -0700

Pass nil to ClientSetup and ServerSetup as now documented.


https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=65fc8d72eccd82237562744ddc85760d426561d8
---
 pt-websocket-client/pt-websocket-client.go |2 +-
 pt-websocket-server/pt-websocket-server.go |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt-websocket-client/pt-websocket-client.go 
b/pt-websocket-client/pt-websocket-client.go
index 20d12bd..f65a9c9 100644
--- a/pt-websocket-client/pt-websocket-client.go
+++ b/pt-websocket-client/pt-websocket-client.go
@@ -205,7 +205,7 @@ func main() {
}
 
log(starting)
-   ptInfo, err = pt.ClientSetup([]string{ptMethodName})
+   ptInfo, err = pt.ClientSetup(nil)
if err != nil {
log(error in setup: %s, err)
os.Exit(1)
diff --git a/pt-websocket-server/pt-websocket-server.go 
b/pt-websocket-server/pt-websocket-server.go
index c393ebc..b14c754 100644
--- a/pt-websocket-server/pt-websocket-server.go
+++ b/pt-websocket-server/pt-websocket-server.go
@@ -228,7 +228,7 @@ func main() {
 
log(starting)
var err error
-   ptInfo, err = pt.ServerSetup([]string{ptMethodName})
+   ptInfo, err = pt.ServerSetup(nil)
if err != nil {
log(error in setup: %s, err)
os.Exit(1)

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

[tor-commits] [meek/master] Pass nil to ClientSetup and ServerSetup as now documented.

2015-06-27 Thread dcf

commit 6b3663aa109b3414972feba1232202520671475e
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:53:51 2015 -0700

Pass nil to ClientSetup and ServerSetup as now documented.


https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=65fc8d72eccd82237562744ddc85760d426561d8
---
 meek-client/meek-client.go |2 +-
 meek-server/meek-server.go |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 2b8bbaa..a5dea2e 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -394,7 +394,7 @@ func main() {
httpTransport = *http.DefaultTransport.(*http.Transport)
httpTransport.Proxy = nil
 
-   ptInfo, err = pt.ClientSetup([]string{ptMethodName})
+   ptInfo, err = pt.ClientSetup(nil)
if err != nil {
log.Fatalf(error in ClientSetup: %s, err)
}
diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index ac5aa3e..5b28e79 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -348,7 +348,7 @@ func main() {
}
 
var err error
-   ptInfo, err = pt.ServerSetup([]string{ptMethodName})
+   ptInfo, err = pt.ServerSetup(nil)
if err != nil {
log.Fatalf(error in ServerSetup: %s, err)
}

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

[tor-commits] [meek/master] Use new convention for Temporary errors from AcceptSocks.

2015-06-27 Thread dcf

commit 9300eeb31c74035fd829da3cce9782d5b6e800c2
Author: David Fifield da...@bamsoftware.com
Date:   Sat Jun 27 20:14:34 2015 -0700

Use new convention for Temporary errors from AcceptSocks.

https://trac.torproject.org/projects/tor/ticket/14135

https://gitweb.torproject.org/pluggable-transports/goptlib.git/commit/?id=50b39b746c6ff34bf31977b658848d876ee84fbf
---
 meek-client/meek-client.go |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index 6198d37..2b8bbaa 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -303,10 +303,10 @@ func acceptLoop(ln *pt.SocksListener) error {
conn, err := ln.AcceptSocks()
if err != nil {
log.Printf(error in AcceptSocks: %s, err)
-   if e, ok := err.(net.Error); ok  !e.Temporary() {
-   return err
+   if e, ok := err.(net.Error); ok  e.Temporary() {
+   continue
}
-   continue
+   return err
}
go func() {
err := handler(conn)

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

51 matches

Mail list logo