date:20160223

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

2016-02-23 Thread translation

commit a3df1648fa9835199c37749eb6f2458e2b0d3222
Author: Translation commit bot 
Date:   Wed Feb 24 07:45:22 2016 +

Update translations for https_everywhere_completed
---
 zh_TW/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index d7e0c9b..27da227 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2016-02-23 Thread translation

commit c546bcceae3bb9009d863799847eec51d31baa6f
Author: Translation commit bot 
Date:   Wed Feb 24 07:45:15 2016 +

Update translations for https_everywhere
---
 zh_TW/https-everywhere.dtd | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd
index a52486d..27da227 100644
--- a/zh_TW/https-everywhere.dtd
+++ b/zh_TW/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
 

___
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] Add support for Twitter DMs

2016-02-23 Thread arlo

commit 4ed24f63821f911de9711db8265d76c404e30d14
Author: Arlo Breault 
Date:   Tue Feb 23 18:57:11 2016 -0800

Add support for Twitter DMs

 * trac 13312
---
 ChangeLog |1 +
 projects/ctypes-otr/config|2 +-
 projects/instantbird/config   |1 +
 projects/instantbird/trac-13312.patch | 1828 +
 4 files changed, 1831 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e03f7fd..d50f962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Tor Messenger 0.1.0b5 --
* Bug 18235: Disable Facebook as they no longer support XMPP
* Bug 17494: Better error reporting for failed outgoing messages
* Bug 17749: Show version information in the "About" window
+   * Bug 13312: OTR over Twitter DMs
  * Mac
* Bug 17896: Add Edit menu to the conversation window on OS X
  * Windows
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index f7227ec..299300c 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://github.com/arlolra/ctypes-otr
-git_hash: 2a8f2c07d7f56e020d7c7c6806baab734471f6ca
+git_hash: 61a6472c732dc4a03b5b315c645c9f265a67b9c6
 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 var:
   lib_glob: 'lib/*.so*'
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 3412ab9..8fb173e 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -75,6 +75,7 @@ input_files:
   - filename: trac-16489.patch
   - filename: trac-17896.patch
   - filename: trac-17494.patch
+  - filename: trac-13312.patch
   - filename: version.patch
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
diff --git a/projects/instantbird/trac-13312.patch 
b/projects/instantbird/trac-13312.patch
new file mode 100644
index 000..37a81a7
--- /dev/null
+++ b/projects/instantbird/trac-13312.patch
@@ -0,0 +1,1828 @@
+# HG changeset patch
+# User Arlo Breault 
+# Date 1456281485 28800
+#  Tue Feb 23 18:38:05 2016 -0800
+# Branch THUNDERBIRD420b2_2015101216_RELBRANCH
+# Node ID 9d547deb66802e3068767b5df2e687f6a56c5099
+# Parent  a23c99d5fced84533a9a764bb63bbd67d874f62c
+Update twitter.js to HEAD to ease applying dm patch
+
+diff --git a/chat/protocols/twitter/twitter.js 
b/chat/protocols/twitter/twitter.js
+--- a/chat/protocols/twitter/twitter.js
 b/chat/protocols/twitter/twitter.js
+@@ -1,35 +1,48 @@
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+-const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
++var {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
+ 
+ Cu.import("resource://gre/modules/Http.jsm");
+ Cu.import("resource:///modules/imServices.jsm");
+ Cu.import("resource:///modules/imXPCOMUtils.jsm");
+ Cu.import("resource:///modules/jsProtoHelper.jsm");
+ Cu.import("resource:///modules/twitter-text.jsm");
+ 
+-const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
+-const kMaxMessageLength = 140;
++var NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
++var kMaxMessageLength = 140;
+ 
+-XPCOMUtils.defineLazyGetter(this, "_", function()
++XPCOMUtils.defineLazyGetter(this, "_", () =>
+   l10nHelper("chrome://chat/locale/twitter.properties")
+ );
+-XPCOMUtils.defineLazyGetter(this, "_lang", function()
++XPCOMUtils.defineLazyGetter(this, "_lang", () =>
+   l10nHelper("chrome://global/locale/languageNames.properties")
+ );
+ initLogModule("twitter", this);
+ 
+-function ChatBuddy(aName) {
++function ChatBuddy(aName, aAccount) {
+   this._name = aName;
++  this._account = aAccount;
+ }
+-ChatBuddy.prototype = GenericConvChatBuddyPrototype;
++ChatBuddy.prototype = {
++  __proto__: GenericConvChatBuddyPrototype,
++  get buddyIconFilename() {
++let userInfo = this._account._userInfo.get(this.name);
++if (userInfo)
++  return userInfo.profile_image_url;
++return undefined;
++  },
++  set buddyIconFilename(aName) {
++// Prevent accidental removal of the getter.
++throw("Don't set chatBuddy.buddyIconFilename directly for Twitter.");
++  }
++}
+ 
+ function Tweet(aTweet, aWho, aMessage, aObject)
+ {
+   this._tweet = aTweet;
+   this._init(aWho, aMessage, aObject);
+ }
+ Tweet.prototype = {
+   __proto__: GenericMessagePrototype,
+@@ -102,26 +115,30 @@ Tweet.prototype = {
+ function Action(aLabel, aAction, aTweet)
+ {
+   this.label = aLabel;
+   this._action = aAction;
+   this._tweet = aTweet;
+ }
+ Action.prototype = {
+   __proto__: ClassInfo("prplIMessageAction", "generic message action object"),
+-  get run() this._action.bind(this._tweet)
++  get run() { return this._action.bind(this._tweet); }
+

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

2016-02-23 Thread translation

commit 2d4f292959efcdb8d15a3bbca62eb713c9226c0c
Author: Translation commit bot 
Date:   Wed Feb 24 00:15:44 2016 +

Update translations for tails-misc
---
 nl.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nl.po b/nl.po
index ec5cae5..4653c78 100644
--- a/nl.po
+++ b/nl.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-20 19:40+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 23:52+\n"
 "Last-Translator: Volluta \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -399,19 +399,19 @@ msgstr "Zowel het host-besturingssysteem en de 
virtualisatiesoftware monitoren w
 msgid "Learn more"
 msgstr "Meer info"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor is niet klaar"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor is niet klaar. De Tor Browser toch starten?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Start de Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Annuleren"
 

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

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

2016-02-23 Thread translation

commit bd6142e3f5ed7d9bde0399064aca45bbd3cb99df
Author: Translation commit bot 
Date:   Wed Feb 24 00:15:50 2016 +

Update translations for tails-misc_completed
---
 nl.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nl.po b/nl.po
index ec5cae5..4653c78 100644
--- a/nl.po
+++ b/nl.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-20 19:40+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 23:52+\n"
 "Last-Translator: Volluta \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -399,19 +399,19 @@ msgstr "Zowel het host-besturingssysteem en de 
virtualisatiesoftware monitoren w
 msgid "Learn more"
 msgstr "Meer info"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor is niet klaar"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor is niet klaar. De Tor Browser toch starten?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Start de Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Annuleren"
 

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

[tor-commits] [gettor/master] Added more locales to landing page

2016-02-23 Thread ilv

commit b5df39ae701ec203027fc29d84be0514ad299789
Author: ilv 
Date:   Tue Feb 23 19:01:54 2016 -0300

Added more locales to landing page
---
 create_gh_mirrors.py | 106 ---
 1 file changed, 66 insertions(+), 40 deletions(-)

diff --git a/create_gh_mirrors.py b/create_gh_mirrors.py
index a341940..e555488 100644
--- a/create_gh_mirrors.py
+++ b/create_gh_mirrors.py
@@ -17,12 +17,12 @@ import github3
 import gettor.core
 
 
-def create_readme(tpl_path, md_path, version, links):
+def create_readme(tpl_path, md_path, tb_version, links):
 """Create README file with links stored in github.links.
 
 :param: tpl_path (string) path to file used as template.
 :param: md_path (string) path to file generated.
-:param: version (string) tor browser version.
+:param: tb_version (string) tor browser version.
 :param: links (object) github links.
 
 """
@@ -75,77 +75,103 @@ def create_readme(tpl_path, md_path, version, links):
 "%LINUX64_{}_SIG%".format(lc), linux64_sig
 )
 
-content_md = content_md.replace("%VERSION%", version)
+content_md = content_md.replace("%TB_VERSION%", tb_version)
 md_file.write(content_md)
 
-print "README generated with version %s" % version
+print "README generated with Tor Browser %s" % tb_version
 
 
-def create_landing_html(tpl_path, html_path, version, links):
+def create_landing_html(tpl_path, html_path, tb_version, links):
 """Create README file with links stored in github.links.
 
 :param: tpl_path (string) path to file used as template.
 :param: html_path (string) path to file generated.
-:param: version (string) tor browser version.
+:param: tb_version (string) tor browser version.
 :param: links (object) github links.
 
 """
-win_link = links.get('windows', 'en')
-win_pkg, win_sig, win_sha = [e for e in win_link.split("$") if e]
-
-osx_link = links.get('osx', 'en')
-osx_pkg, osx_sig, osx_sha = [e for e in osx_link.split("$") if e]
-
-linux_links = links.get('linux', 'en')
-linux32_link, linux64_link = linux_links.split(',')
-linux32_pkg, linux32_sig, linux32_sha = [
-e for e in linux32_link.split("$") if e
-]
-linux64_pkg, linux64_sig, linux64_sha = [
-e for e in linux64_link.split("$") if e
-]
+lcs = ['FA', 'ZH', 'TR', 'EN']
 
 html_file = open(html_path, 'w')
 with open(tpl_path, 'r') as tpl_file:
-content_tpl = tpl_file.read().replace('\n', '')
-content_html = ''
+content_html = tpl_file.read().replace('\n', '')
 
-content_html = content_tpl.replace("%WINDOWS%", win_pkg)
-content_html = content_html.replace("%WINDOWS_SIG%", win_sig)
-
-content_html = content_html.replace("%OSX%", osx_pkg)
-content_html = content_html.replace("%OSX_SIG%", osx_sig)
+for lc in lcs:
+win_link = links.get('windows', lc.lower())
+win_pkg, win_sig, win_sha = [e for e in win_link.split("$") if e]
 
-content_html = content_html.replace("%LINUX32%", linux32_pkg)
-content_html = content_html.replace("%LINUX32_SIG%", linux32_sig)
-content_html = content_html.replace("%LINUX64%", linux64_pkg)
-content_html = content_html.replace("%LINUX64_SIG%", linux64_sig)
+osx_link = links.get('osx', lc.lower())
+osx_pkg, osx_sig, osx_sha = [e for e in osx_link.split("$") if e]
 
-content_html = content_html.replace("%VERSION%", version)
+linux_links = links.get('linux', lc.lower())
+linux32_link, linux64_link = linux_links.split(',')
+linux32_pkg, linux32_sig, linux32_sha = [
+e for e in linux32_link.split("$") if e
+]
+linux64_pkg, linux64_sig, linux64_sha = [
+e for e in linux64_link.split("$") if e
+]
+
+content_html = content_html.replace(
+"%WINDOWS_{}%".format(lc), win_pkg
+)
+"""
+content_html = content_html.replace(
+"%WINDOWS_{}_SIG%".format(lc), win_sig
+)
+"""
+content_html = content_html.replace(
+"%OSX_{}%".format(lc), osx_pkg
+)
+"""
+content_html = content_html.replace(
+"%OSX_{}_SIG%".format(lc), osx_sig
+)
+"""
+content_html = content_html.replace(
+"%LINUX32_{}%".format(lc), linux32_pkg
+)
+"""
+content_html = content_html.replace(
+"%LINUX32_{}_SIG%".format(lc), linux32_sig
+)
+"""
+content_html = content_html.replace(
+"%LINUX64_{}%".format(lc), linux64_pkg
+)
+"""
+content_html = content_html.replace(
+

[tor-commits] [gettor/master] Improved templates for readme and landing

2016-02-23 Thread ilv

commit dce9da5121b6e998e9281171978ff9dae15e2ae3
Author: ilv 
Date:   Tue Feb 23 19:03:11 2016 -0300

Improved templates for readme and landing
---
 upload/landing_gh.tpl | 133 +-
 upload/readme_gh.tpl  |   2 +-
 2 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/upload/landing_gh.tpl b/upload/landing_gh.tpl
index c10c15b..771756a 100644
--- a/upload/landing_gh.tpl
+++ b/upload/landing_gh.tpl
@@ -17,7 +17,7 @@
 
 
 
-GetTor
+GetTor - Github mirror
 
 
 
@@ -30,55 +30,96 @@
 
 
 
-
-
-Download Tor Browser
-
-Below you will find links to download the latest version 
of Tor Browser (%VERSION%).
-
-
+
 
-Direct downloads
-
-
+
 
-
+
 
-
-Tor Browser for 
Windows(signature file)
+
+
+Download Tor Browser
+
+Below you will find links to download the latest 
version of Tor Browser (%TB_VERSION%).
+
 
 
-
-
-
-
-
-Tor Browser for OS 
X(signature file)
-
-
-
-
-
-
-
-Tor Browser for Linux 
32-bit(signature file)
-
-
-
-
-
+
+
+
+Direct downloads
+
+
+
+
+
+
+Tor Browser for 
Windows
+English, Farsi, Chinese, Turkish
+
+
+
+
+
+
+
+Tor Browser for OS 
X
+English, Farsi, Chinese, Turkish
+
+
+
+
+
+
+
+Tor Browser for Linux 
32-bit
+English, Farsi, Chinese, Turkish
+
+
+
+
+
+
+
+Tor Browser for Linux 
64-bit
+English, Farsi, Chinese, Turkish
+
+
 
-
-Tor Browser for Linux 
64-bit(signature file)
+
+Alternative downloads
+
+Get links via Email: 
You can send an email to mailto:get...@torproject.org;>get...@torproject.org. 
+Send the word help in the body of the 
message to learn how to interact with it.
+
+
+Get links via XMPP: You 
can send a message to get_...@riseup.net using your favorite 
XMPP client. Simply
+enter help in an XMPP message to 
learn how to interact with it.
+
+
+Get links via Twitter: 
You can send a direct message to https://twitter.com/get_tor;>@get_tor account
+(you don't need to follow). Send the word 
help in a direct message to learn
+how to interact with it.
+
+Get bridges
+
+Bridges are Tor relays that help you circumvent 
censorship. If you suspect your access to the
+Tor network is being blocked, you may want to use 
bridges. You can get bridges from
+the https://bridges.torproject.org;>HTTP 
distributor. You can also send
+an email to mailto:brid...@torproject.org;>brid...@torproject.org 
+(please note that you must send the email using an 
address from one of the following email providers: riseup, gmail or 
yahoo).
+
 
 
 
@@ -86,8 +127,8 @@
 
 
 
-
- The Tor Project
+
+

[tor-commits] [gettor/master] Improve xmpp message

2016-02-23 Thread ilv

commit 9fa016d9d8961545bccf14747d7c01b0ae09f1db
Author: ilv 
Date:   Tue Feb 23 19:04:19 2016 -0300

Improve xmpp message
---
 lang/xmpp/i18n/en/LC_MESSAGES/en.po | 53 +++--
 1 file changed, 15 insertions(+), 38 deletions(-)

diff --git a/lang/xmpp/i18n/en/LC_MESSAGES/en.po 
b/lang/xmpp/i18n/en/LC_MESSAGES/en.po
index 8cc715e..46c2738 100644
--- a/lang/xmpp/i18n/en/LC_MESSAGES/en.po
+++ b/lang/xmpp/i18n/en/LC_MESSAGES/en.po
@@ -2,58 +2,35 @@ domain "en"
 
 #: Links
 msgid "links"
-msgstr "Hello there! this is the 'GetTor' robot.\n\
-\n\
-Below are the links for your request (Tor Browser for %s, %s package):\n\
-\n\
-%s\n\
+msgstr "You requested Tor Browser for %s.\n\
 \n\
-===\n\
-Still need help? If you have any questions, trouble connecting to Tor\n\
-network, or need to talk to a human, please contact our support team at:\n\
+You will need only one of the links below to download the bundle. If a link\n\
+does not work for you, try the next one.\n\
 \n\
-h...@rt.torproject.org\n\
-\n\
-We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\
-French and Spanish."
+%s"
 
 #: Mirrors message
 msgid "mirrors"
-msgstr "Hello there! this is the 'GetTor' robot.\n\
-\n\
-Thank you for your request. Below you will find an updated list of mirrors\n\
-of Tor Project's website.\n\
+msgstr "Hi! this is the GetTor robot.\n\
 \n\
-%s\n\
+Thank you for your request. Below you will find an updated list of\n\
+mirrors of Tor Project's website.\n\
 \n\
-Still need help? If you have any questions, trouble connecting to Tor\n\
-network, or need to talk to a human, please contact our support team at:\n\
-\n\
-h...@rt.torproject.org\n\
-\n\
-We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\
-French and Spanish."
+%s"
 
 #: Help
 msgid "help"
-msgstr "Hello there! this is the 'GetTor' robot.\n\
-\n\
-Thank you for your request. I am here to help you download the latest\n\
-Tor Browser.\n\
+msgstr "Hi! This is the GetTor robot. I am here to help you download the\n\
+latest version of Tor Browser.\n\
 \n\
-Please reply to this message with one of the options below (where lc stands\n\
-for the locale of the package you want e.g. en):\n\
+Please reply to this message with one of the options below:\n\
 \n\
-windows lc\n\
-linux lc\n\
-osx lc\n\
+windows\n\
+linux\n\
+osx\n\
 mirrors\n\
 \n\
-The currently supported locales are:\n\
-\n\
-en: English\n\
-\n\
-And I will send you the download/access instructions quickly."
+I will then send you the download instructions."
 
 #: Mirrors unavailable message
 msgid "mirrors_unavailable"

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

[tor-commits] [gettor/master] Updating landing page.

2016-02-23 Thread ilv

commit 6beecb0d747f39d95e265b894b74776e0715fae1
Author: Israel Leiva 
Date:   Tue Feb 16 04:53:56 2016 +

Updating landing page.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 28d6b19..9a35f10 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-

GetTor | Download Tor Browser for Android, Windows, Linux, OS X  

  GetTor
 
   https://www.torproject.org;>The Tor Project  
  <
 /div> 
   Download Tor Browser  
  Below you will find links to download the latest version of Tor Browser 
(5.5.2).
Direct downloads
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe;
 class="big-link">Tor Browser for Windows(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe.asc;>signature
 file) 
   https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg;
 class="big-link">Tor Browser for OS X(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 32-bit(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 64-bit(https://github.com/TheTorProje
 
ct/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz.asc">signature
 file)
 The Tor 
Project
\ No newline at end of file
+

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor
 
   https://www.torproject.org;>The Tor Project  
  
  
   Download Tor Browser  
  Below you will find links to download the latest version of Tor Browser 
(5.5.2).
Direct downloads 
https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe;
 class="big-link">Tor Browser for Windows(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe.asc;>signature
 file) 
   https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg;
 class="big-link">Tor Browser for OS X(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg.asc;>signature
 file) 
   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 32-bit(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 64-bit(https://github.com/TheTorProject/gettor

[tor-commits] [gettor/master] Testing project pages

2016-02-23 Thread ilv

commit 163ea5fe8dc17c3c0f0aaa3a7f9548fbcd5fff98
Author: ilv 
Date:   Thu Feb 11 17:28:19 2016 -0300

Testing project pages
---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
new file mode 100644
index 000..5c1b149
--- /dev/null
+++ b/index.html
@@ -0,0 +1 @@
+hola



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

[tor-commits] [gettor/master] Updating landing page.

2016-02-23 Thread ilv

commit f77e2bc8b2c33df98375362482e011237293ba5d
Author: Israel Leiva 
Date:   Tue Feb 23 21:32:53 2016 +

Updating landing page.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 6695f5a..abf3bf7 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor - Github 
mirror
https://www.torproject.org;>The Tor 
Project  
 
 
 
  
  Download Tor Browser   
 Below you will find links to download the latest version of Tor Browser 
(5.5.2).
 
   Direct downloads  
 
  
 
   Tor Browser for Windows   
 English, Farsi, Chinese, Turkish 
 
   

Tor 
Browser for OS XEnglish, Farsi, Chinese, Turkish 
  

 Tor Browser for Linux 32-bit  
  English, Farsi, Chinese, Turkish
  
 
 Tor Browser for Linux 64-bit  
  English, Farsi, Chinese, Turkish 
  
 Alternative 
downloads
Get links via Email: You can send an email to mailto:get...@torproject.org;>gettor@torprojec
 t.org. Send the word help in the 
body of the message to learn how to interact with it. 
   Get links via XMPP: You can send a message to get_...@riseup.net using your favorite XMPP client. Simply 
   enter help in an XMPP message to learn how to 
interact with it.Get links via 
Twitter: You can send a direct message to https://twitter.com/get_tor;>@get_tor account
(you don't need to follow). Send the word help in a direct 
message to learnhow to interact with it.
Get bridges  
   Bridges are Tor relays that help you circumvent censorship. If 
you suspect your access to theTor network is being 
blocked, you may want to use bridges. You can get bridges from  
  the https://bridges.torproject.org;>HTTP distributor. You 
can also sendan email to mailto:brid...@torproject.org;>brid...@torproject.org (please note that you must send the email 
using an address from one of the following email providers: riseup, gmail or 
yahoo).
  
   The Tor Project 2016

\ No newline at end of file
+

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor - Github 
mirror
https://www.torproject.org;>The Tor 
Project  
   

  
  Download Tor Browser   
 Below you will find links to download the latest version of Tor Browser 
(5.5.2).
 
   Direct downloads

[tor-commits] [gettor/master] Updating landing page.

2016-02-23 Thread ilv

commit 0cbc5101750abfaf8348e22d4d744950dbe19cd5
Author: Israel Leiva 
Date:   Tue Feb 23 21:26:25 2016 +

Updating landing page.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 9a35f10..6695f5a 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor
 
   https://www.torproject.org;>The Tor Project  
  
  
   Download Tor Browser  
  Below you will find links to download the latest version of Tor Browser 
(5.5.2).
Direct downloads 
https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe;
 class="big-link">Tor Browser for Windows(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe.asc;>signature
 file) 
   https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg;
 class="big-link">Tor Browser for OS X(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg.asc;>signature
 file) 
   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 32-bit(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 64-bit(https://github.com/TheTorProject/gettor
 
browser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz.asc">signature
 file)
 The Tor 
Project
\ No newline at end of file
+

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor - Github 
mirror
https://www.torproject.org;>The Tor 
Project  
 
 
 
  
  Download Tor Browser   
 Below you will find links to download the latest version of Tor Browser 
(5.5.2).
 
   Direct downloads  
 
  
 
   Tor Browser for Windows   
 English, Farsi, Chinese, Turkish 
 
   

Tor 
Browser for OS XEnglish, Farsi, Chinese, Turkish 
  

 Tor Browser for Linux 32-bit  
  English, Farsi, Chinese, Turkish
  
 
 Tor Browser for Linux 64-bit  
  English, Farsi, Chinese, Turkish 
  
 Alternative 
downloads
Get links via Email: You can send an email to mailto:get...@torproject.org;>gettor@torprojec
 t.org.

[tor-commits] [gettor/master] Updating landing page.

2016-02-23 Thread ilv

commit 471c0527308e564822283ac98dfbd8ef53472e45
Author: Israel Leiva 
Date:   Tue Feb 16 03:26:41 2016 +

Updating landing page.
---
 index.html | 95 +-
 1 file changed, 1 insertion(+), 94 deletions(-)

diff --git a/index.html b/index.html
index b147a1d..28d6b19 100644
--- a/index.html
+++ b/index.html
@@ -1,94 +1 @@
-
-
-
-
-
-
-
-
-GetTor | Download Tor Browser for Android, Windows, Linux, OS 
X
-
-
-
-
-
-
-
-
-
-
-GetTor
-
-
-
-
-https://www.torproject.org;>The Tor Project
-
-
-
-
-
-
-
-
-
-Download Tor Browser
-
-Below you will find links to download the latest version 
of Tor Browser.
-
-
-
-Direct downloads
-
-
-
-
-
-Tor Browser for 
Android(signature file)
-
-
-
-
-
-
-
-Tor Browser for 
Windows(signature file)
-
-
-
-
-
-
-
-Tor Browser for OS X(signature file)
-
-
-
-
-
-
-
-Tor Browser for Linux 
32-bit(signature file)
-
-
-
-
-
-
-
-Tor Browser for Linux 
64-bit(signature file)
-
-
-
-
-
-
-
-
- The Tor Project
-
-
-
-
-
-
+

GetTor | Download Tor Browser for Android, Windows, Linux, OS X  

  GetTor
 
   https://www.torproject.org;>The Tor Project  
  <
 /div> 
   Download Tor Browser  
  Below you will find links to download the latest version of Tor Browser 
(5.5.2).
Direct downloads
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe;
 class="big-link">Tor Browser for Windows(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/torbrowser-install-5.5.2_en-US.exe.asc;>signature
 file) 
   https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg;
 class="big-link">Tor Browser for OS X(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/TorBrowser-5.5.2-osx64_en-US.dmg.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 32-bit(https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux32-5.5.2_en-US.tar.xz.asc;>signature
 file)   
 https://github.com/TheTorProject/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz;
 class="big-link">Tor Browser for Linux 64-bit(https://github.com/TheTorProje
 
ct/gettorbrowser/releases/download/v5.5.2/tor-browser-linux64-5.5.2_en-US.tar.xz.asc">signature
 file)
 The Tor 
Project
\ No newline at end of file



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

[tor-commits] [gettor/master] Updating landing page.

2016-02-23 Thread ilv

commit 523bdde44b9672de0dfdebdafa5ec1f6775b30f0
Author: Israel Leiva 
Date:   Tue Feb 23 21:42:21 2016 +

Updating landing page.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index abf3bf7..a4d7af8 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor - Github 
mirror
https://www.torproject.org;>The Tor 
Project  
   

  
  Download Tor Browser   
 Below you will find links to download the latest version of Tor Browser 
(5.5.2).
 
   Direct downloads  
  
 
 
   Tor Browser for Windows   
 English, Farsi, Chinese, Turkish 
   <
 /div>  
   
   Tor Browser for OS X
English, Farsi, Chinese, Turkish 
  

 Tor Browser for Linux 32-bit  
  English, Farsi, Chinese, Turkish 


   
Tor Browser for Linux 64-bit
English, Farsi, Chinese, Turkish   
 Alternative downloads 
   Get links via Email: You can send an email to mailto:get...@torproject.or
 g">get...@torproject.org. Send the word 
help in the body of the message to learn how to interact with 
it. 
   Get links via XMPP: You can send 
a message to get_...@riseup.net using your favorite XMPP 
client. Simplyenter help in an XMPP 
message to learn how to interact with it. 
   Get links via Twitter: You can send a direct message 
to https://twitter.com/get_tor;>@get_tor account   
 (you don't need to follow). Send the word help in a 
direct message to learnhow to interact with it. 
   Get bridges
Bridges are Tor relays that help you 
circumvent censorship. If you suspect your access to the
Tor network is being blocked, you may want to use bridges. You can get bridges 
fromthe https://bridges.torproject.org;>HTTP 
distributor. You can also sendan email to mailto:brid...@torproject.org;>brid...@torproject.org (please note that you must send the email 
using an address from one of the following email providers: riseup, gmail or 
yahoo).
  
   The Tor Project 2016

\ No newline at end of file
+

GetTor | Download Tor Browser for Windows, Linux, OS X
  
  GetTor - Github 
mirror
https://www.torproject.org;>The Tor 
Project  
   

  
  Download Tor Browser   
 Below you will find links to download the latest version of Tor Browser 
(5.5.2).
 
   Direct downloads

[tor-commits] [gettor/master] Merge branch 'gh-pages' of https://github.com/thetorproject/gettor

2016-02-23 Thread ilv

commit 9bb2dd63c60f8b897aa1ce5a1df887db7fdf4cbd
Merge: fafda21 523bdde
Author: ilv 
Date:   Tue Feb 23 19:00:48 2016 -0300

Merge branch 'gh-pages' of https://github.com/thetorproject/gettor

 css/bootstrap.min.css|  10 ++
 css/gettor.css   |  83 +
 fonts/glyphicons-halflings-regular.eot   | Bin 0 -> 20127 bytes
 fonts/glyphicons-halflings-regular.svg   | 288 +++
 fonts/glyphicons-halflings-regular.ttf   | Bin 0 -> 45404 bytes
 fonts/glyphicons-halflings-regular.woff  | Bin 0 -> 23424 bytes
 fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
 fonts/lato-bold.woff | Bin 0 -> 46160 bytes
 fonts/lato-italic.woff   | Bin 0 -> 47168 bytes
 fonts/lato-regular.woff  | Bin 0 -> 46108 bytes
 img/android-logo.png | Bin 0 -> 3320 bytes
 img/linux-logo.png   | Bin 0 -> 6545 bytes
 img/osx-logo.png | Bin 0 -> 6958 bytes
 img/windows-logo.png | Bin 0 -> 8777 bytes
 index.html   |   1 +
 15 files changed, 382 insertions(+)



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

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

2016-02-23 Thread translation

commit 0f562e991700f706ecc21bc5c9efc6846b1f77c3
Author: Translation commit bot 
Date:   Tue Feb 23 21:45:22 2016 +

Update translations for https_everywhere_completed
---
 nl/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index bc73e14..4f5986b 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2016-02-23 Thread translation

commit 406c9fbfa7f0c380f4e8ec3f057d6ea96c1c167a
Author: Translation commit bot 
Date:   Tue Feb 23 21:45:15 2016 +

Update translations for https_everywhere
---
 nl/https-everywhere.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index 22fa44c..4f5986b 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
+
+
+
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 

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

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

2016-02-23 Thread nickm

commit a7f303a4818b551b4a59a3624cc337294a2703e3
Merge: 94c8f36 67e5d49
Author: Nick Mathewson 
Date:   Tue Feb 23 14:05:54 2016 -0500

Merge branch 'maint-0.2.7'

 changes/bug14821| 4 
 src/common/compat.h | 9 +
 2 files changed, 13 insertions(+)




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

[tor-commits] [tor/maint-0.2.7] Make clang asan work with FORTIFIED_SOURCE again.

2016-02-23 Thread nickm

commit 67e5d49d8a995c6d3b8bf4177046271a7d4dd157
Author: Nick Mathewson 
Date:   Mon Feb 22 14:07:58 2016 -0500

Make clang asan work with FORTIFIED_SOURCE again.

Short version: clang asan hates the glibc strcmp macro in
bits/string2.h if you are passing it a constant string argument of
length two or less.  (I could be off by one here, but that's the
basic idea.)

Closes issue 14821.
---
 changes/bug14821| 4 
 src/common/compat.h | 9 +
 2 files changed, 13 insertions(+)

diff --git a/changes/bug14821 b/changes/bug14821
new file mode 100644
index 000..0920d1f
--- /dev/null
+++ b/changes/bug14821
@@ -0,0 +1,4 @@
+  o Major bugfixes (compilation):
+- Correctly repair hardened builds under the clang compiler. Previously,
+  our use of _FORTIFY_SOURCE would conflict with clang's address
+  sanitizer. Closes ticket 14821.
diff --git a/src/common/compat.h b/src/common/compat.h
index c7c468c..66cc079 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -42,6 +42,15 @@
 #include 
 #endif
 
+#if defined(__has_feature)
+#  if __has_feature(address_sanitizer)
+/* Some of the fancy glibc strcmp() macros include references to memory that
+ * clang rejects because it is off the end of a less-than-3. Clang hates this,
+ * even though those references never actually happen. */
+#undef strcmp
+#  endif
+#endif
+
 #include 
 #include 
 

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

[tor-commits] [tor/master] Another clang+_FORTIFY_SOURCE issue

2016-02-23 Thread nickm

commit 1318c1611fed301f44d69a2d6e4f012efd94c9cc
Author: Nick Mathewson 
Date:   Mon Feb 22 14:07:58 2016 -0500

Another clang+_FORTIFY_SOURCE issue

There was a parenthesis issue in test_util that clang found
confusing.  This part was only in master.

Closes issue 14821.
---
 src/test/test_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 37f7d93..0cec0c4 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4364,7 +4364,8 @@ test_util_socket(void *arg)
   (void)arg;
 
   fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0);
-  if (SOCK_ERR_IS_EPROTO(fd1)) {
+  int err = tor_socket_errno(fd1);
+  if (fd1 < 0 && err == SOCK_ERRNO(EPROTONOSUPPORT)) {
 /* Assume we're on an IPv4-only or IPv6-only system, and give up now. */
 goto done;
   }

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

[tor-commits] [tor/master] Make clang asan work with FORTIFIED_SOURCE again.

2016-02-23 Thread nickm

commit 67e5d49d8a995c6d3b8bf4177046271a7d4dd157
Author: Nick Mathewson 
Date:   Mon Feb 22 14:07:58 2016 -0500

Make clang asan work with FORTIFIED_SOURCE again.

Short version: clang asan hates the glibc strcmp macro in
bits/string2.h if you are passing it a constant string argument of
length two or less.  (I could be off by one here, but that's the
basic idea.)

Closes issue 14821.
---
 changes/bug14821| 4 
 src/common/compat.h | 9 +
 2 files changed, 13 insertions(+)

diff --git a/changes/bug14821 b/changes/bug14821
new file mode 100644
index 000..0920d1f
--- /dev/null
+++ b/changes/bug14821
@@ -0,0 +1,4 @@
+  o Major bugfixes (compilation):
+- Correctly repair hardened builds under the clang compiler. Previously,
+  our use of _FORTIFY_SOURCE would conflict with clang's address
+  sanitizer. Closes ticket 14821.
diff --git a/src/common/compat.h b/src/common/compat.h
index c7c468c..66cc079 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -42,6 +42,15 @@
 #include 
 #endif
 
+#if defined(__has_feature)
+#  if __has_feature(address_sanitizer)
+/* Some of the fancy glibc strcmp() macros include references to memory that
+ * clang rejects because it is off the end of a less-than-3. Clang hates this,
+ * even though those references never actually happen. */
+#undef strcmp
+#  endif
+#endif
+
 #include 
 #include 
 



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

[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed

2016-02-23 Thread translation

commit 14140f66b75e4db6b60e63e364cdf4e1a9d46d4f
Author: Translation commit bot 
Date:   Tue Feb 23 17:47:17 2016 +

Update translations for tor-messenger-privproperties_completed
---
 el/priv.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/el/priv.properties b/el/priv.properties
index 9ac81d0..a643b96 100644
--- a/el/priv.properties
+++ b/el/priv.properties
@@ -1 +1,2 @@
 priv.account=ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î¹Î´Î¹ÏÏÎ¹ÎºÏ ÎºÎ»ÎµÎ¹Î´Î¯ Î³Î¹Î± ÏÎ¿ %S 
(%S) ...
+priv.failed=ÎÏÎ¿ÏÏÏÎ¯Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï: %S

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

[tor-commits] [translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2016-02-23 Thread translation

commit 0813a5392c028a377e011db3519ef77c1b60ce41
Author: Translation commit bot 
Date:   Tue Feb 23 17:47:09 2016 +

Update translations for tor-messenger-otrproperties_completed
---
 el/otr.properties | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/el/otr.properties b/el/otr.properties
new file mode 100644
index 000..c6fff0f
--- /dev/null
+++ b/el/otr.properties
@@ -0,0 +1,31 @@
+msgevent.encryption_required_part1=Î ÏÎ¿ÏÏÎ¬Î¸Î·ÏÎµÏ Î½Î± 
ÏÏÎµÎ¯Î»ÎµÎ¹Ï ÎÎ½Î± Î¼Î· ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î± 
ÏÏÎ¿Î½/Î·Î½ %S. Î©Ï ÏÎ¿Î»Î¹ÏÎ¹ÎºÎ®, ÏÎ± Î¼Î· ÎºÏÏ
ÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î± Î¼Î·Î½ÏÎ¼Î±ÏÎ± Î´ÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎ¿Î½ÏÎ±Î¹.
+msgevent.encryption_required_part2=Î ÏÎ¿ÏÏÎ±Î¸Î¿ÏÎ¼Îµ Î½Î± 
Î¾ÎµÎºÎ¹Î½Î®ÏÎ¿ÏÎ¼Îµ Î¼Î¹Î± Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ¶Î®ÏÎ·ÏÎ·. Î¤Î¿ Î¼Î®Î½Ï
Î¼Î¬ ÏÎ¿Ï Î¸Î± ÎµÏÎ±Î½ÎµÎºÏÎµÎ¼ÏÎ¸ÎµÎ¯ ÏÏÎ±Î½ Î¾ÎµÎºÎ¹Î½Î®ÏÎµÎ¹ Î· 
Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ¶Î®ÏÎ·ÏÎ·.
+msgevent.encryption_error=Î Î±ÏÎ¿ÏÏÎ¹Î¬ÏÏÎ·ÎºÎµ ÏÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ 
ÏÎ·Î½ ÎºÏÏÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÏÏ ÏÎ¿Ï. Î¤Î¿ 
Î¼Î®Î½ÏÎ¼Î± Î´ÎµÎ½ ÏÏÎ¬Î»Î¸Î·ÎºÎµ.
+msgevent.connection_ended=Î/Î %S ÎÏÎµÎ¹ Î®Î´Î· ÎºÎ»ÎµÎ¯ÏÎµÎ¹ ÏÎ·Î½ 
Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î´ÎµÏÎ· Î¼Îµ ÏÎÎ½Î±. Î¤Î¿ Î¼Î®Î½ÏÎ¼Î¬ ÏÎ¿Ï Î´ÎµÎ½ 
ÏÏÎ¬Î»Î¸Î·ÎºÎµ. ÎÎ¯ÏÎµ ÏÎµÏÎ¼Î¬ÏÎ¹ÏÎµ ÏÎ·Î½ Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÎ¿Ï 
ÏÏÎ¶Î®ÏÎ·ÏÎ·, ÎµÎ¯ÏÎµ Î¾Î±Î½Î±Î¾ÎµÎºÎ¯Î½Î·ÏÎ ÏÎ·Î½.
+msgevent.setup_error=Î Î±ÏÎ¿ÏÏÎ¹Î¬ÏÏÎ·ÎºÎµ ÏÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ 
Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î¹Î´Î¹ÏÏÎ¹ÎºÎ®Ï ÏÏÎ¶Î®ÏÎ·ÏÎ·Ï Î¼Îµ ÏÎ¿Î½/ÏÎ·Î½ 
%S.
+msgevent.msg_reflected=ÎÎ±Î¼Î²Î¬Î½ÎµÎ¹Ï ÏÎ± Î´Î¹ÎºÎ¬ ÏÎ¿Ï OTR 
Î¼Î·Î½ÏÎ¼Î±ÏÎ±. ÎÎ¯ÏÎµ ÏÏÎ¿ÏÏÎ±Î¸ÎµÎ¯Ï Î½Î± Î¼Î¹Î»Î®ÏÎµÎ¹Ï ÏÏÎ¿Î½ 
ÎµÎ±ÏÏÏ ÏÎ¿Ï, ÎµÎ¯ÏÎµ ÎºÎ¬ÏÎ¿Î¹Î¿Ï ÎµÏÎ±Î½ÎµÎºÏÎÎ¼ÏÎµÎ¹ ÏÎ± 
Î¼Î·Î½ÏÎ¼Î±ÏÎ¬ ÏÎ¿Ï ÏÎ¬Î»Î¹ ÏÎµ ÏÎÎ½Î±.
+msgevent.msg_resent=Î¤Î¿ ÏÎµÎ»ÎµÏÏÎ±Î¯Î¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Ï 
ÏÎ¿Î½/ÏÎ·Î½ %S ÎµÏÎ±Î½ÎµÎºÏÎÎ¼ÏÎ¸Î·ÎºÎµ.
+msgevent.rcvdmsg_not_private=Î¤Î¿ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î± 
ÏÎ¿Ï Î»Î®ÏÎ¸Î·ÎºÎµ Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ 
Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿, ÎºÎ±Î¸ÏÏ Î´ÎµÎ½ ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½ÎµÎ¯ÏÎµ 
Î¹Î´Î¹ÏÏÎ¹ÎºÎ¬.
+msgevent.rcvdmsg_unreadable=ÎÎ¬Î²Î±Î¼Îµ ÎÎ½Î± Î¼Î· Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿ 
ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î± Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S.
+msgevent.rcvdmsg_malformed=Î Î±ÏÎ±Î»Î¬Î²Î±Î¼Îµ Î¼Î®Î½ÏÎ¼Î± Î¼Îµ 
ÎºÎ±ÎºÏÎ¼Î¿ÏÏÎ± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Î±ÏÏ %S.
+msgevent.log_heartbeat_rcvd=ÎÎ®ÏÎ¸Î·ÎºÎµ Î Î±Î»Î¼ÏÏ Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ 
%S.
+msgevent.log_heartbeat_sent=Î£ÏÎ¬Î»Î¸Î·ÎºÎµ Î Î±Î»Î¼ÏÏ ÏÏÎ¿Î½/ÏÏÎ·Î½ %S.
+msgevent.rcvdmsg_general_err=Î£ÏÎ½ÎÎ²Î· ÎºÎ¬ÏÎ¿Î¹Î¿ ÏÏÎ¬Î»Î¼Î± ÏÏÎ¿ OTR.
+msgevent.rcvdmsg_unecrypted=Î¤Î¿ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î¼Î®Î½ÏÎ¼Î± Î±ÏÏ ÏÎ¿Î½ 
%S Î´ÎµÎ½ Î®ÏÎ±Î½ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿: %S
+msgevent.rcvdmsg_unrecognized=ÎÎ¬Î²Î±Î¼Îµ ÎÎ½Î± Î¼Î· 
Î±Î½Î±Î³Î½ÏÏÎ¯ÏÎ¹Î¼Î¿ Î¼Î®Î½ÏÎ¼Î± OTR Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S.
+msgevent.rcvdmsg_for_other_instance=%S ÎÏÏÎµÎ¹Î»Îµ Î¼Î®Î½ÏÎ¼Î± Î³Î¹Î± 
Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ session. ÎÎ½ ÏÏÎ½Î´ÎµÎ¸Î®ÎºÎ±ÏÎµ ÏÎ¿Î»Î»ÎÏ 
ÏÎ¿ÏÎÏ, Î¼Î¹Î± Î¬Î»Î»Î· session Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎ¬ÏÎµÎ¹ ÏÎ¿ Î¼Î®Î½Ï
Î¼Î±.
+context.gone_secure_private=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ 
ÏÎ¿Î½/ÏÎ·Î½ %S Î¾ÎµÎºÎ¯Î½Î·ÏÎµ.
+context.gone_secure_unverified=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ 
ÏÎ¿Î½/ÏÎ·Î½ %S Î¾ÎµÎºÎ¯Î½Î·ÏÎµ. Î Î±Ï' ÏÎ»Î± Î±ÏÏÎ¬, Î· ÏÎ±Ï
ÏÏÏÎ·ÏÎ¬ ÏÎ¿Ï/ÏÎ·Ï Î´ÎµÎ½ ÎÏÎµÎ¹ ÎµÏÎ±Î»Î·Î¸ÎµÏÏÎµÎ¯.
+context.still_secure=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ ÏÎ¿Î½/ÏÎ·Î½ 
%S Î±Î½Î±Î½ÎµÏÎ¸Î·ÎºÎµ ÎµÏÎ¹ÏÏÏÏÏ.
+error.enc=Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ ÎºÏÏÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÎ¿Ï 
Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï.
+error.not_priv=ÎÏÏÎµÎ¹Î»ÎµÏ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î± 
Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÏÏÎ¿Î½/ÏÏÎ·Î½ %S, ÏÎ¿Ï Î´ÎµÎ½ ÏÎ± ÏÎµÏÎ¯Î¼ÎµÎ½Îµ.
+error.unreadable=ÎÎ¾ÎÏÎµÎ¼ÏÎµÏ ÎÎ½Î± Î¼Î· Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿ ÎºÏÏ
ÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î±.
+error.malformed=ÎÎµÏÎ±Î´ÏÏÎ±ÏÎµ Î¼Î®Î½ÏÎ¼Î± Î¼Îµ ÎºÎ±ÎºÏÎ¼Î¿ÏÏÎ± 
Î´ÎµÎ´Î¿Î¼ÎÎ½Î±.
+resent=[ÎµÏÎ±Î½ÎµÎºÏÎÎ¼ÏÎ¸Î·ÎºÎµ]
+tlv.disconnected=Î/Î %S ÎÎ»Î·Î¾Îµ ÏÎ·Î½ Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÎ¿Ï/ÏÎ·Ï ÏÏ
Î¶Î®ÏÎ·ÏÎ· Î¼Îµ ÏÎÎ½Î±. Î ÏÎÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÎºÎ±Î¹ ÎµÏÏ ÏÎ¿ 
Î¯Î´Î¹Î¿.
+query.msg=%S Î¶Î®ÏÎ·ÏÎµ Off-the Record Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ¶Î®ÏÎ·ÏÎ·. 
Î©ÏÏÏÏÎ¿, Î´ÎµÎ½ ÎÏÎµÏÎµ ÏÎ¿ ÏÏÏÏÎ¸ÎµÏÎ¿ ÏÎ¿Ï ÏÎ¿ Ï
ÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹. ÎÎµÏ http://otr.cypherpunks.ca/ Î³Î¹Î± 
ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ.
+trust.unused=ÎÎ· ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼ÎµÎ½Î¿
+trust.not_private=ÎÏÎ¹ ÎÎ´Î¹ÏÏÎ¹ÎºÏ
+trust.unverified=ÎÎ· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î¿
+trust.private=ÎÎ´Î¹ÏÏÎ¹ÎºÏ
+trust.finished=Î¤ÎµÎ»ÎµÎ¹ÏÎ¼ÎÎ½

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2016-02-23 Thread translation

commit d7a7ff95fe1765cfaf4b28707d2a78c1d208bdf4
Author: Translation commit bot 
Date:   Tue Feb 23 17:47:04 2016 +

Update translations for tor-messenger-otrproperties
---
 el/otr.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/el/otr.properties b/el/otr.properties
index 609abc1..c6fff0f 100644
--- a/el/otr.properties
+++ b/el/otr.properties
@@ -7,23 +7,23 @@ msgevent.msg_reflected=ÎÎ±Î¼Î²Î¬Î½ÎµÎ¹Ï ÏÎ± Î´Î¹ÎºÎ¬ ÏÎ¿Ï
 OTR Î¼Î·Î½ÏÎ¼Î±
 msgevent.msg_resent=Î¤Î¿ ÏÎµÎ»ÎµÏÏÎ±Î¯Î¿ Î¼Î®Î½ÏÎ¼Î± ÏÏÎ¿Ï 
ÏÎ¿Î½/ÏÎ·Î½ %S ÎµÏÎ±Î½ÎµÎºÏÎÎ¼ÏÎ¸Î·ÎºÎµ.
 msgevent.rcvdmsg_not_private=Î¤Î¿ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î± 
ÏÎ¿Ï Î»Î®ÏÎ¸Î·ÎºÎµ Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ 
Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿, ÎºÎ±Î¸ÏÏ Î´ÎµÎ½ ÎµÏÎ¹ÎºÎ¿Î¹Î½ÏÎ½ÎµÎ¯ÏÎµ 
Î¹Î´Î¹ÏÏÎ¹ÎºÎ¬.
 msgevent.rcvdmsg_unreadable=ÎÎ¬Î²Î±Î¼Îµ ÎÎ½Î± Î¼Î· Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿ 
ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î± Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S.
-msgevent.rcvdmsg_malformed=We received a malformed data message from %S.
+msgevent.rcvdmsg_malformed=Î Î±ÏÎ±Î»Î¬Î²Î±Î¼Îµ Î¼Î®Î½ÏÎ¼Î± Î¼Îµ 
ÎºÎ±ÎºÏÎ¼Î¿ÏÏÎ± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Î±ÏÏ %S.
 msgevent.log_heartbeat_rcvd=ÎÎ®ÏÎ¸Î·ÎºÎµ Î Î±Î»Î¼ÏÏ Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ 
%S.
 msgevent.log_heartbeat_sent=Î£ÏÎ¬Î»Î¸Î·ÎºÎµ Î Î±Î»Î¼ÏÏ ÏÏÎ¿Î½/ÏÏÎ·Î½ %S.
 msgevent.rcvdmsg_general_err=Î£ÏÎ½ÎÎ²Î· ÎºÎ¬ÏÎ¿Î¹Î¿ ÏÏÎ¬Î»Î¼Î± ÏÏÎ¿ OTR.
-msgevent.rcvdmsg_unecrypted=The following message received from %S was not 
encrypted: %S
+msgevent.rcvdmsg_unecrypted=Î¤Î¿ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î¼Î®Î½ÏÎ¼Î± Î±ÏÏ ÏÎ¿Î½ 
%S Î´ÎµÎ½ Î®ÏÎ±Î½ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿: %S
 msgevent.rcvdmsg_unrecognized=ÎÎ¬Î²Î±Î¼Îµ ÎÎ½Î± Î¼Î· 
Î±Î½Î±Î³Î½ÏÏÎ¯ÏÎ¹Î¼Î¿ Î¼Î®Î½ÏÎ¼Î± OTR Î±ÏÏ ÏÎ¿Î½/ÏÎ·Î½ %S.
-msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a 
different session. If you are logged in multiple times, another session may 
have received the message.
+msgevent.rcvdmsg_for_other_instance=%S ÎÏÏÎµÎ¹Î»Îµ Î¼Î®Î½ÏÎ¼Î± Î³Î¹Î± 
Î´Î¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÏ session. ÎÎ½ ÏÏÎ½Î´ÎµÎ¸Î®ÎºÎ±ÏÎµ ÏÎ¿Î»Î»ÎÏ 
ÏÎ¿ÏÎÏ, Î¼Î¹Î± Î¬Î»Î»Î· session Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎ¬ÏÎµÎ¹ ÏÎ¿ Î¼Î®Î½Ï
Î¼Î±.
 context.gone_secure_private=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ 
ÏÎ¿Î½/ÏÎ·Î½ %S Î¾ÎµÎºÎ¯Î½Î·ÏÎµ.
 context.gone_secure_unverified=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ 
ÏÎ¿Î½/ÏÎ·Î½ %S Î¾ÎµÎºÎ¯Î½Î·ÏÎµ. Î Î±Ï' ÏÎ»Î± Î±ÏÏÎ¬, Î· ÏÎ±Ï
ÏÏÏÎ·ÏÎ¬ ÏÎ¿Ï/ÏÎ·Ï Î´ÎµÎ½ ÎÏÎµÎ¹ ÎµÏÎ±Î»Î·Î¸ÎµÏÏÎµÎ¯.
 context.still_secure=Î Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ½Î¿Î¼Î¹Î»Î¯Î± Î¼Îµ ÏÎ¿Î½/ÏÎ·Î½ 
%S Î±Î½Î±Î½ÎµÏÎ¸Î·ÎºÎµ ÎµÏÎ¹ÏÏÏÏÏ.
 error.enc=Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ ÎºÏÏÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÎ¿Ï 
Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï.
 error.not_priv=ÎÏÏÎµÎ¹Î»ÎµÏ ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î± 
Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÏÏÎ¿Î½/ÏÏÎ·Î½ %S, ÏÎ¿Ï Î´ÎµÎ½ ÏÎ± ÏÎµÏÎ¯Î¼ÎµÎ½Îµ.
 error.unreadable=ÎÎ¾ÎÏÎµÎ¼ÏÎµÏ ÎÎ½Î± Î¼Î· Î±Î½Î±Î³Î½ÏÏÎ¹Î¼Î¿ ÎºÏÏ
ÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î¿ Î¼Î®Î½ÏÎ¼Î±.
-error.malformed=You transmitted a malformed data message.
+error.malformed=ÎÎµÏÎ±Î´ÏÏÎ±ÏÎµ Î¼Î®Î½ÏÎ¼Î± Î¼Îµ ÎºÎ±ÎºÏÎ¼Î¿ÏÏÎ± 
Î´ÎµÎ´Î¿Î¼ÎÎ½Î±.
 resent=[ÎµÏÎ±Î½ÎµÎºÏÎÎ¼ÏÎ¸Î·ÎºÎµ]
 tlv.disconnected=Î/Î %S ÎÎ»Î·Î¾Îµ ÏÎ·Î½ Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÎ¿Ï/ÏÎ·Ï ÏÏ
Î¶Î®ÏÎ·ÏÎ· Î¼Îµ ÏÎÎ½Î±. Î ÏÎÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÎºÎ±Î¹ ÎµÏÏ ÏÎ¿ 
Î¯Î´Î¹Î¿.
-query.msg=%S has requested an Off-the Record private conversation. However, 
you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for 
more information.
+query.msg=%S Î¶Î®ÏÎ·ÏÎµ Off-the Record Î¹Î´Î¹ÏÏÎ¹ÎºÎ® ÏÏÎ¶Î®ÏÎ·ÏÎ·. 
Î©ÏÏÏÏÎ¿, Î´ÎµÎ½ ÎÏÎµÏÎµ ÏÎ¿ ÏÏÏÏÎ¸ÎµÏÎ¿ ÏÎ¿Ï ÏÎ¿ Ï
ÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹. ÎÎµÏ http://otr.cypherpunks.ca/ Î³Î¹Î± 
ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ.
 trust.unused=ÎÎ· ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î¿ÏÎ¼ÎµÎ½Î¿
 trust.not_private=ÎÏÎ¹ ÎÎ´Î¹ÏÏÎ¹ÎºÏ
 trust.unverified=ÎÎ· ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î¿

___
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

2016-02-23 Thread translation

commit 0cbacd39d1ad898d891f1d00d134634bc38230ed
Author: Translation commit bot 
Date:   Tue Feb 23 17:45:58 2016 +

Update translations for tails-misc
---
 el.po |  2 +-
 ru.po | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/el.po b/el.po
index 2597192..7ba648c 100644
--- a/el.po
+++ b/el.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-12 13:52+0100\n"
-"PO-Revision-Date: 2016-02-23 17:07+\n"
+"PO-Revision-Date: 2016-02-23 17:23+\n"
 "Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ru.po b/ru.po
index c66e51e..3e3a7cc 100644
--- a/ru.po
+++ b/ru.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 14:07+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 17:28+\n"
 "Last-Translator: Antony A. Tolmachev \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -405,19 +405,19 @@ msgstr "ÐÐ°Ðº Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ñ
Ð¾ÑÑ-Ð¼Ð°ÑÐ¸Ð½Ñ, Ñ
 msgid "Learn more"
 msgstr "ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ "
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor Ð½Ðµ Ð³Ð¾ÑÐ¾Ð²"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor Ð½Ðµ Ð³Ð¾ÑÐ¾Ð². ÐÑÑ ÑÐ°Ð²Ð½Ð¾ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Tor Browser?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð°"
 

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

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

2016-02-23 Thread translation

commit d176fbc55828c5601034cbe0b012abec44bc7f55
Author: Translation commit bot 
Date:   Tue Feb 23 17:46:20 2016 +

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

diff --git a/el.po b/el.po
index 222756c..9ad34db 100644
--- a/el.po
+++ b/el.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-02-23 17:12+\n"
+"PO-Revision-Date: 2016-02-23 17:23+\n"
 "Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"

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

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

2016-02-23 Thread translation

commit c2b5329127b81e88aeeb1c95962a403116d8e5cd
Author: Translation commit bot 
Date:   Tue Feb 23 17:46:25 2016 +

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

diff --git a/el.po b/el.po
index 222756c..9ad34db 100644
--- a/el.po
+++ b/el.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-02-23 17:12+\n"
+"PO-Revision-Date: 2016-02-23 17:23+\n"
 "Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"

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

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

2016-02-23 Thread translation

commit e663f08763f88e65280a54bf1843a6d78fefdb46
Author: Translation commit bot 
Date:   Tue Feb 23 17:46:02 2016 +

Update translations for tails-misc_completed
---
 ru.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ru.po b/ru.po
index c66e51e..3e3a7cc 100644
--- a/ru.po
+++ b/ru.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 14:07+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 17:28+\n"
 "Last-Translator: Antony A. Tolmachev \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -405,19 +405,19 @@ msgstr "ÐÐ°Ðº Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ñ
Ð¾ÑÑ-Ð¼Ð°ÑÐ¸Ð½Ñ, Ñ
 msgid "Learn more"
 msgstr "ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ "
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor Ð½Ðµ Ð³Ð¾ÑÐ¾Ð²"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor Ð½Ðµ Ð³Ð¾ÑÐ¾Ð². ÐÑÑ ÑÐ°Ð²Ð½Ð¾ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÑ Tor Browser?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð°"
 

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

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

2016-02-23 Thread translation

commit 9a1c43334b676631eb1e92004bead81269305d36
Author: Translation commit bot 
Date:   Tue Feb 23 17:45:21 2016 +

Update translations for https_everywhere_completed
---
 ru/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 93910ea..3a79d88 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2016-02-23 Thread translation

commit 6c8464b5b6db3687048969552fbdb138daa5a83f
Author: Translation commit bot 
Date:   Tue Feb 23 17:45:35 2016 +

Update translations for tails-persistence-setup_completed
---
 el/el.po | 95 
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/el/el.po b/el/el.po
index 4d5f057..c66f942 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-12-14 21:35+0100\n"
-"PO-Revision-Date: 2015-12-15 09:27+\n"
+"POT-Creation-Date: 2016-01-25 17:34+0100\n"
+"PO-Revision-Date: 2016-02-23 17:23+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -58,69 +58,69 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Î ÏÎ¿ÏÎ¯Î» ÏÎ¿Ï Pidgin ÎºÎ±Î¹ ÎºÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· OTR "
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid "Icedove"
+msgstr "Icedove"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid "Icedove profiles and locally stored email"
+msgstr "Î ÏÎ¿ÏÎ¯Î» Icedove ÎºÎ±Î¹ ÏÎ¿ÏÎ¹ÎºÎ¬ Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼ÎÎ½Î± 
email"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
 msgstr "ÎÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· GNOME "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
 msgstr "ÎÏÏÏÎ¹ÎºÎ¬ ÏÎ¿Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ·Î½ 
ÎºÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· GNOME"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
 msgstr "Î£ÏÎ½Î´ÎÏÎµÎ¹Ï ÎÎ¹ÎºÏÏÎ¿Ï"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
 msgid "Configuration of network devices and connections"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÏÏÎºÎµÏÏÎ½ Î´Î¹ÎºÏÏÏÎ½ ÎºÎ±Î¹ ÏÏ
Î½Î´ÎÏÎµÏÎ½"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
 msgstr "Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏÎµÏ Î ÎµÏÎ¹Î·Î³Î·ÏÎ® "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏÎµÏ ÏÎ¿Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½ ÏÏÎ¿Î½ 
ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Tor"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
 msgstr "ÎÎºÏÏÏÏÏÎÏ"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
 msgstr "ÎÎ¹Î±Î¼ÏÏÏÏÏÎ· ÎÎºÏÏÏÏÏÏÎ½"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
 msgstr "Î ÎµÎ»Î¬ÏÎ·Ï Bitcoin"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Î Î¿ÏÏÎ¿ÏÏÎ»Î¹ bitcoin ÎºÎ±Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï Electrum"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
 msgstr "Î Î±ÎºÎÏÎ± APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
 msgstr "Î Î±ÎºÎÏÎ± ÎºÎ±ÏÎµÎ²Î±ÏÎ¼ÎÎ½Î± Î±ÏÏ ÏÎ¿ APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"
 msgstr "ÎÎ¯ÏÏÎµÏ APT"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
 msgid "Lists downloaded by APT"
 msgstr "ÎÎ¯ÏÏÎµÏ ÎºÎ±ÏÎµÎ²Î±ÏÎ¼ÎÎ½ÎµÏ Î±ÏÏ ÏÎ¿ APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "Icedove"
-msgstr "Icedove"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Icedove profiles and locally stored email"
-msgstr "Î ÏÎ¿ÏÎ¯Î» Icedove ÎºÎ±Î¹ ÏÎ¿ÏÎ¹ÎºÎ¬ Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼ÎÎ½Î± 
email"
-
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Dotfiles"
 msgstr "ÎÏÏÏÎ¬ Î±ÏÏÎµÎ¯Î± ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ (dotfiles)"
@@ -130,71 +130,71 @@ msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr "Symlink ÏÏÎ¿ $HOME ÎºÎ¬Î¸Îµ Î±ÏÏÎµÎ¯Î¿Ï Î® ÏÎ±ÎºÎÎ»Î¿Ï ÏÎ¿Ï 
Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÏÏÎ¿Î½ ÏÏÏÎ¿ Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Ï 'dotfiles'"
 
-#: ../lib/Tails/Persistence/Setup.pm:227
+#: ../lib/Tails/Persistence/Setup.pm:230
 msgid "Setup Tails persistent volume"

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

2016-02-23 Thread translation

commit 619301b86c98048b2e77581d34e5815b381607a7
Author: Translation commit bot 
Date:   Tue Feb 23 17:45:30 2016 +

Update translations for tails-persistence-setup
---
 el/el.po | 95 
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/el/el.po b/el/el.po
index 4d5f057..c66f942 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-12-14 21:35+0100\n"
-"PO-Revision-Date: 2015-12-15 09:27+\n"
+"POT-Creation-Date: 2016-01-25 17:34+0100\n"
+"PO-Revision-Date: 2016-02-23 17:23+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -58,69 +58,69 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Î ÏÎ¿ÏÎ¯Î» ÏÎ¿Ï Pidgin ÎºÎ±Î¹ ÎºÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· OTR "
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid "Icedove"
+msgstr "Icedove"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid "Icedove profiles and locally stored email"
+msgstr "Î ÏÎ¿ÏÎ¯Î» Icedove ÎºÎ±Î¹ ÏÎ¿ÏÎ¹ÎºÎ¬ Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼ÎÎ½Î± 
email"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
 msgstr "ÎÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· GNOME "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
 msgstr "ÎÏÏÏÎ¹ÎºÎ¬ ÏÎ¿Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¿Î½ÏÎ±Î¹ ÏÏÎ·Î½ 
ÎºÎ»ÎµÎ¹Î´Î¿Î¸Î®ÎºÎ· GNOME"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
 msgstr "Î£ÏÎ½Î´ÎÏÎµÎ¹Ï ÎÎ¹ÎºÏÏÎ¿Ï"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
 msgid "Configuration of network devices and connections"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÏÏÎºÎµÏÏÎ½ Î´Î¹ÎºÏÏÏÎ½ ÎºÎ±Î¹ ÏÏ
Î½Î´ÎÏÎµÏÎ½"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
 msgstr "Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏÎµÏ Î ÎµÏÎ¹Î·Î³Î·ÏÎ® "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Î£ÎµÎ»Î¹Î´Î¿Î´ÎµÎ¯ÎºÏÎµÏ ÏÎ¿Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½ ÏÏÎ¿Î½ 
ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Tor"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
 msgstr "ÎÎºÏÏÏÏÏÎÏ"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
 msgstr "ÎÎ¹Î±Î¼ÏÏÏÏÏÎ· ÎÎºÏÏÏÏÏÏÎ½"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
 msgstr "Î ÎµÎ»Î¬ÏÎ·Ï Bitcoin"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Î Î¿ÏÏÎ¿ÏÏÎ»Î¹ bitcoin ÎºÎ±Î¹ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï Electrum"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
 msgstr "Î Î±ÎºÎÏÎ± APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
 msgstr "Î Î±ÎºÎÏÎ± ÎºÎ±ÏÎµÎ²Î±ÏÎ¼ÎÎ½Î± Î±ÏÏ ÏÎ¿ APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"
 msgstr "ÎÎ¯ÏÏÎµÏ APT"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
 msgid "Lists downloaded by APT"
 msgstr "ÎÎ¯ÏÏÎµÏ ÎºÎ±ÏÎµÎ²Î±ÏÎ¼ÎÎ½ÎµÏ Î±ÏÏ ÏÎ¿ APT "
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "Icedove"
-msgstr "Icedove"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Icedove profiles and locally stored email"
-msgstr "Î ÏÎ¿ÏÎ¯Î» Icedove ÎºÎ±Î¹ ÏÎ¿ÏÎ¹ÎºÎ¬ Î±ÏÎ¿Î¸Î·ÎºÎµÏÎ¼ÎÎ½Î± 
email"
-
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Dotfiles"
 msgstr "ÎÏÏÏÎ¬ Î±ÏÏÎµÎ¯Î± ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ (dotfiles)"
@@ -130,71 +130,71 @@ msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
 msgstr "Symlink ÏÏÎ¿ $HOME ÎºÎ¬Î¸Îµ Î±ÏÏÎµÎ¯Î¿Ï Î® ÏÎ±ÎºÎÎ»Î¿Ï ÏÎ¿Ï 
Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÏÏÎ¿Î½ ÏÏÏÎ¿ Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ·Ï 'dotfiles'"
 
-#: ../lib/Tails/Persistence/Setup.pm:227
+#: ../lib/Tails/Persistence/Setup.pm:230
 msgid "Setup Tails persistent volume"
 msgstr "

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

2016-02-23 Thread translation

commit 4123fb04445cdcacd6afa9b5f4240882aa711360
Author: Translation commit bot 
Date:   Tue Feb 23 17:45:15 2016 +

Update translations for https_everywhere
---
 ru/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index d90d2db..3a79d88 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -50,7 +50,7 @@
 
 
 
-
-
+
+
 
 

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

[tor-commits] [tor/master] Replace two instances of N_DIGEST_ALGORITHMS.

2016-02-23 Thread nickm

commit 94c8f3605f39a8a9058e7c0222386f3dd8dbfa7c
Author: Nick Mathewson 
Date:   Tue Feb 23 12:42:10 2016 -0500

Replace two instances of N_DIGEST_ALGORITHMS.

These should have been N_COMMON_DIGEST_ALGORITHMS.

Fixes bug 18380; bug not in any released Tor.
---
 src/or/dirvote.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 80e4c33..a81d1a9 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2121,7 +2121,7 @@ networkstatus_add_detached_signatures(networkstatus_t 
*target,
   *msg_out = "No digests for given consensus flavor";
   return -1;
 }
-for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
+for (alg = DIGEST_SHA1; alg < N_COMMON_DIGEST_ALGORITHMS; ++alg) {
   if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
 if (fast_memeq(target->digests.d[alg], digests->d[alg],
DIGEST256_LEN)) {
@@ -2314,7 +2314,7 @@ networkstatus_get_detached_signatures(smartlist_t 
*consensuses)
 
 /* start with SHA256; we don't include SHA1 for anything but the basic
  * consensus. */
-for (alg = DIGEST_SHA256; alg < N_DIGEST_ALGORITHMS; ++alg) {
+for (alg = DIGEST_SHA256; alg < N_COMMON_DIGEST_ALGORITHMS; ++alg) {
   char d[HEX_DIGEST256_LEN+1];
   const char *alg_name =
 crypto_digest_algorithm_get_name(alg);

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

[tor-commits] [webwml/master] Drop commented out project ideas

2016-02-23 Thread atagar

commit cfd38ff48e4be6fc21f7d0556073c70f6fc37626
Author: Damian Johnson 
Date:   Tue Feb 23 09:30:20 2016 -0800

Drop commented out project ideas

They're invisible anyway, why burden page load with these? We can always
resurrect them later if we want - that's what revision control is for after
all!
---
 getinvolved/en/volunteer.wml | 149 ---
 1 file changed, 149 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 25e7621..4eda17c 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1089,55 +1089,6 @@ information see ticket 7416.
 
 
 
-
-
 
 
 Improve test coverage in Tor
@@ -1421,106 +1372,6 @@ in order to make the code base more robust.
 
 
 
-
-

[tor-commits] [webwml/master] Add 'Implement and Integrate CONIKS for Tor Messenger' project idea

2016-02-23 Thread atagar

commit a7cbf704197e8494bb63d80885f7b99dfadbb0df
Author: Damian Johnson 
Date:   Tue Feb 23 09:37:14 2016 -0800

Add 'Implement and Integrate CONIKS for Tor Messenger' project idea

Project idea courtesy of Arlo.
---
 getinvolved/en/volunteer.wml | 72 
 1 file changed, 72 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 4eda17c..cd4908f 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1371,6 +1371,78 @@ tampering.  Third, unit tests should be added for 
existing and new code
 in order to make the code base more robust.
 
 
+
+
+
+Implement and Integrate CONIKS for Tor Messenger
+
+Effort Level: Medium
+
+Skill Level: Medium
+
+Likely Mentors: Marcela, Arlo (arlolra)
+
+CONIKS is an end-user key management and verification system for end-to-end
+secure communication services, which improves upon existing key management
+systems by providing both strong security and better usability using a model
+called key transparency. CONIKS does this by requiring providers to manage
+tamper-evident, publicly-auditable key directories, which contain mappings from
+usernames to public keys, on behalf of their users. This design makes it easier
+for users (both "default" users and power users) to establish trust since they
+don't have to worry about or even see keys, but users also don't have to
+trust the provider to be well-behaved because the CONIKS client can run as
+part of the secure messaging app and automatically check that the service
+provider doesnât map spurious keys to their users' usernames, and it can
+verify that observed name-to-key mappings are consistent with what other
+clients in the system are seeing. Unlike existing key transparency solutions,
+CONIKS also provides strong privacy guarantees by employing cryptographic
+primitives for robust data obfuscation.
+
+
+
+The CONIKS system design, protocols, and proof-of-concept are described in
+great detail in the https://www.usenix.org/system/files/conference/usenixsecurity15/sec15-paper-melara.pdf;>CONIKS
+research paper, and basic reference implementations of a CONIKS key server
+and a CONIKS client are avialable on https://github.com/coniks-sys/coniks-ref-implementation;>Github.
+
+
+
+This project has two main components: (1) designing and implementing a CONIKS
+key server tailored to Tor Messenger users, and (2) building a CONIKS client
+which integrates with the Tor Messenger client. One challenge the applicant
+will face is ensuring that the key server design is efficient and scalable for
+large volumes of users, concurrent traffic and guarantees this scalability even
+as Tor Messenger's user base grows. On the client side, the main challenges
+will be to focus on space efficiency as well as minimizing computational
+overhead when implementing the CONIKS consistency checks, and determining how
+to best communicate CONIKS consistency check results to users in the UI. Since
+Tor Messenger does not hand out online identities per se, as most online
+communication services do (like, say, Twitter, in which each user has a unique
+handle), the CONIKS key server for Tor Messenger will have to map usernames
+from third-party communication services to the encryption keys used in Tor
+Messenger. One additional important challenge that the applicant will have to
+help address is ensuring that each such third-party username remains unique in
+the Tor Messenger space and that such external, third-party identities are
+indeed controlled by the expected user of that third-party communication
+service.
+
+
+
+Some design and implementation questions have been discussed in https://trac.torproject.org/projects/tor/ticket/17961;>Ticket #17961.
+
+
+
+The applicant should have some familiarity with well-known crypto primitives
+and algorithms, as well as have a basic understanding of the key transparency
+model. Client side integration will require some basic use of JavaScript.
+Consider submitting a patch for https://github.com/arlolra/ctypes-otr/issues;>one of the open key
+verification issues as part of the application process.
+
+

[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed

2016-02-23 Thread translation

commit cac2b0fbe1ed5ada454203eac54afca7302b
Author: Translation commit bot 
Date:   Tue Feb 23 17:17:01 2016 +

Update translations for tor-messenger-privproperties_completed
---
 bg/priv.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bg/priv.properties b/bg/priv.properties
index c7070ee..aa968c2 100644
--- a/bg/priv.properties
+++ b/bg/priv.properties
@@ -1 +1,2 @@
 priv.account=Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð»Ð¸ÑÐµÐ½ ÐºÐ»ÑÑ Ð·Ð° %S (%S) ...
+priv.failed=Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾ Ð½Ð° ÐºÐ»ÑÑ Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾: %S

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

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

2016-02-23 Thread translation

commit 477e24720e0cfac8aef4e8df0c486ab8294a8187
Author: Translation commit bot 
Date:   Tue Feb 23 17:16:19 2016 +

Update translations for tails-perl5lib_completed
---
 el.po | 21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/el.po b/el.po
index 55972c0..222756c 100644
--- a/el.po
+++ b/el.po
@@ -4,22 +4,33 @@
 # 
 # Translators:
 # metamec, 2015
+# TitanJack , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2014-06-24 11:37+0200\n"
-"PO-Revision-Date: 2015-04-23 19:41+\n"
-"Last-Translator: metamec\n"
-"Language-Team: Greek 
(http://www.transifex.com/projects/p/torproject/language/el/)\n"
+"POT-Creation-Date: 2016-01-25 16:59+0100\n"
+"PO-Revision-Date: 2016-02-23 17:12+\n"
+"Last-Translator: TitanJack \n"
+"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/RunningSystem.pm:153
+#: ../lib/Tails/RunningSystem.pm:159
+msgid "Error"
+msgstr "Î£ÏÎ¬Î»Î¼Î±"
+
+#: ../lib/Tails/RunningSystem.pm:161
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the `toram'"
 " option?"
 msgstr "Î ÏÏÏÎºÎµÏÎ® Î±ÏÏ ÏÎ·Î½ Î¿ÏÎ¿Î¯Î± ÏÏÎÏÎµÎ¹ ÏÎ¿ Tails 
Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯. ÎÏÏÏ ÎÏÎµÏÎµ 
ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÎ¹ ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î® 'toram'; "
+
+#: ../lib/Tails/RunningSystem.pm:192
+msgid ""
+"The drive Tails is running from cannot be found. Maybe you used the `toram' "
+"option?"
+msgstr "Î Î¿Î´Î·Î³ÏÏ Tails ÏÎ¿Ï ÏÏÎÏÎµÎ¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± 
Î²ÏÎµÎ¸ÎµÎ¯. Î§ÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ±ÏÎµ ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î®  `toram' ;"

___
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

2016-02-23 Thread translation

commit 2d0f007d0acb242763a604fbe59c60b85306f3dd
Author: Translation commit bot 
Date:   Tue Feb 23 17:15:56 2016 +

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

diff --git a/el.po b/el.po
index 9e71083..2597192 100644
--- a/el.po
+++ b/el.po
@@ -17,13 +17,14 @@
 # kotkotkot , 2013
 # LOUKAS SKOUROLIAKOS, 2015
 # metamec, 2015
+# TitanJack , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-12 13:52+0100\n"
-"PO-Revision-Date: 2016-02-23 16:30+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-02-23 17:07+\n"
+"Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -253,7 +254,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71
 msgid "Restart"
-msgstr ""
+msgstr "ÎÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ· "
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:74
 #: 
../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1
@@ -323,7 +324,7 @@ msgstr "ÎÏÏÎ® Î· ÎÎºÎ´Î¿ÏÎ· ÏÎ¿Ï Tails ÎÏÎµÎ¹ 
Î³Î½ÏÏÏÎ¬ ÏÏÎ¿Î²Î»Î®
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:156
 msgid "Known security issues"
-msgstr ""
+msgstr "ÎÎ½ÏÏÏÎ¬ Î¸ÎÎ¼Î±ÏÎ± Î±ÏÏÎ¬Î»ÎµÎ¹Î±Ï "
 
 #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
 #, sh-format
@@ -383,7 +384,7 @@ msgstr "Î¤ÏÏÎ¿ ÏÎ¿ Î»ÎµÎ¹ÏÎ¿ÏÏÎ³Î¹ÎºÏ ÏÏÏÏÎ·Î¼Î± 
ÏÎ¿Ï ÏÎ¹Î»Î¿Î¾Îµ
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72
 msgid "Warning: non-free virtual machine detected!"
-msgstr ""
+msgstr "Î ÏÎ¿ÏÎ¿ÏÎ®: Î¼Î·-ÎµÎ»ÎµÏÎ¸ÎµÏÎ· ÎµÎ¹ÎºÎ¿Î½Î¹ÎºÎ® Î¼Î·ÏÎ±Î½Î® 
ÎµÎ½ÏÎ¿ÏÎ¯ÏÏÎ·ÎºÎµ!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
 msgid ""
@@ -395,7 +396,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79
 msgid "Learn more"
-msgstr ""
+msgstr "ÎÎ¬Î¸Îµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
@@ -422,7 +423,7 @@ msgid ""
 "Network activity within the Unsafe Browser is not anonymous.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
-msgstr ""
+msgstr "Î Î´ÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎ± Î¼ÎÏÎ± Î±ÏÏ Unsafe Browser  
Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½ÏÎ½ÏÎ¼Î·.\\n Î§ÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÏÎµ Unsafe 
Browser Î¼ÏÎ½Î¿ ÏÏÎ±Î½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³ÎºÎ±Î¯Î¿, Î³Î¹Î± 
ÏÎ±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±\\n Î±Î½ ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î½Î± ÏÏÎ½Î´ÎµÎ¸ÎµÎ¯ÏÎµ Î® 
Î½Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÎµÏÎµ Î³Î¹Î± ÏÎ·Î½ ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·Ï 
ÏÏÎ½Î´ÎµÏÎ·Ï ÏÏÎ¿ Î´Î¹Î±Î´Î¯ÎºÏÏÎ¿."
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47
 msgid "Starting the Unsafe Browser..."

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

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

2016-02-23 Thread translation

commit 1eefb7747af13285de68a927a527ce8020418d91
Author: Translation commit bot 
Date:   Tue Feb 23 17:16:14 2016 +

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

diff --git a/el.po b/el.po
index 5305d2e..222756c 100644
--- a/el.po
+++ b/el.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # metamec, 2015
+# TitanJack , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-11 15:40+0100\n"
-"PO-Revision-Date: 2016-01-12 08:13+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-01-25 16:59+0100\n"
+"PO-Revision-Date: 2016-02-23 17:12+\n"
+"Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ../lib/Tails/RunningSystem.pm:159
 msgid "Error"
-msgstr ""
+msgstr "Î£ÏÎ¬Î»Î¼Î±"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""
@@ -32,4 +33,4 @@ msgstr "Î ÏÏÏÎºÎµÏÎ® Î±ÏÏ ÏÎ·Î½ Î¿ÏÎ¿Î¯Î± 
ÏÏÎÏÎµÎ¹ ÏÎ¿ Tails Î´Îµ
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the `toram' "
 "option?"
-msgstr ""
+msgstr "Î Î¿Î´Î·Î³ÏÏ Tails ÏÎ¿Ï ÏÏÎÏÎµÎ¹ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± 
Î²ÏÎµÎ¸ÎµÎ¯. Î§ÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎ±ÏÎµ ÏÎ·Î½ ÎµÏÎ¹Î»Î¿Î³Î®  `toram' ;"

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

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

2016-02-23 Thread translation

commit 113c1c054d7d1e9d62086d440b615036ed7d9a92
Author: Translation commit bot 
Date:   Tue Feb 23 17:15:49 2016 +

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

diff --git a/el/progress.dtd b/el/progress.dtd
index 70b8fc5..e63961a 100644
--- a/el/progress.dtd
+++ b/el/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2016-02-23 Thread translation

commit 749b52d6706c15995db7ed824d46e5ef9b0ae05d
Author: Translation commit bot 
Date:   Tue Feb 23 17:15:45 2016 +

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

diff --git a/el/progress.dtd b/el/progress.dtd
index 9f96b8d..e63961a 100644
--- a/el/progress.dtd
+++ b/el/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2016-02-23 Thread translation

commit fa4540d3ddcd6964e2feda97e16f81aa60676eb6
Author: Translation commit bot 
Date:   Tue Feb 23 17:15:23 2016 +

Update translations for https_everywhere_completed
---
 el/https-everywhere.dtd| 30 ++
 pt_BR/https-everywhere.dtd | 13 +
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd
index b5fa535..55218f5 100644
--- a/el/https-everywhere.dtd
+++ b/el/https-everywhere.dtd
@@ -3,14 +3,18 @@
 
 
 
+
 
 
+
+
 
 
 
 
 
 
+
 
 
 
@@ -34,17 +38,19 @@
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
 
-
-
-
diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index d7e1489..1ec5834 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2016-02-23 Thread translation

commit 3886fe8657458f206417c555b9125fe2c0cf9ee6
Author: Translation commit bot 
Date:   Tue Feb 23 17:15:17 2016 +

Update translations for https_everywhere
---
 bg/https-everywhere.dtd|  6 +++---
 el/https-everywhere.dtd|  6 +++---
 pt_BR/https-everywhere.dtd | 10 +-
 ru/https-everywhere.dtd|  8 
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd
index 1b01292..f64b53d 100644
--- a/bg/https-everywhere.dtd
+++ b/bg/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,8 +42,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd
index 86c9c6b..55218f5 100644
--- a/el/https-everywhere.dtd
+++ b/el/https-everywhere.dtd
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
@@ -49,7 +49,7 @@
 
 
 
-
+
 
 
 
diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index df58ba9..1ec5834 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -42,14 +42,14 @@
 
 
 
-
-
+
+
 
 
-
+
 
-
-
+
+
 
 
 
diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index bfe75aa..d90d2db 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -46,10 +46,10 @@
 
 
 
-
-
-
-
+
+
+
+
 
 
 

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

[tor-commits] [stem/master] FallbackDirectory unicode normalization issue for python3

2016-02-23 Thread atagar

commit a6aca45c3dbc543f4023818e6f77b7d61e4221e3
Author: Damian Johnson 
Date:   Tue Feb 23 08:56:39 2016 -0800

FallbackDirectory unicode normalization issue for python3

Need to normalize so both python2 and python3 are happy...

  ==
  ERROR: test_fallback_directories_from_remote
  --
  Traceback (most recent call last):
File "/usr/local/lib/python3.2/dist-packages/mock/mock.py", line 1305, 
in patched
  return func(*args, **keywargs)
File "/home/atagar/Desktop/stem/test/unit/descriptor/remote.py", line 
193, in test_fallback_directories_from_remote
  fallback_directories = 
stem.descriptor.remote.FallbackDirectory.from_remote()
File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 949, 
in from_remote
  elif line.startswith('"'):
  TypeError: startswith first arg must be bytes or a tuple of bytes, not str

  --
  Ran 6 tests in 0.018s
---
 stem/descriptor/remote.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index f96d6a7..6739df5 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -94,7 +94,7 @@ except ImportError:
 import stem.descriptor
 
 from stem import Flag
-from stem.util import connection, log, tor_tools
+from stem.util import connection, log, str_tools, tor_tools
 
 # Tor has a limited number of descriptors we can fetch explicitly by their
 # fingerprint or hashes due to a limit on the url length by squid proxies.
@@ -924,7 +924,7 @@ class FallbackDirectory(Directory):
 """
 
 try:
-  fallback_dir_page = urllib.urlopen(GITWEB_FALLBACK_DIR_URL, timeout = 
timeout).read()
+  fallback_dir_page = 
str_tools._to_unicode(urllib.urlopen(GITWEB_FALLBACK_DIR_URL, timeout = 
timeout).read())
 except:
   exc = sys.exc_info()[1]
   raise IOError("Unable to download tor's fallback directories from %s: 
%s" % (GITWEB_FALLBACK_DIR_URL, exc))

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

[tor-commits] [stem/master] DescriptorDownloader TypeError under python3

2016-02-23 Thread atagar

commit b6ba68cb16ad38204a414d238487122521f6cf4e
Author: Damian Johnson 
Date:   Tue Feb 23 08:52:51 2016 -0800

DescriptorDownloader TypeError under python3

Oops, python3 collections issue from recent changes...

  ==
  ERROR: test_persisting_a_consensus
  --
  Traceback (most recent call last):
File "/usr/local/lib/python3.2/dist-packages/mock/mock.py", line 1305, 
in patched
  return func(*args, **keywargs)
File "/home/atagar/Desktop/stem/test/unit/tutorial_examples.py", line 
343, in test_persisting_a_consensus
  exec_documentation_example('persisting_a_consensus.py')
File "/home/atagar/Desktop/stem/test/unit/__init__.py", line 24, in 
exec_documentation_example
  exec(code)
File 
"/home/atagar/Desktop/stem/docs/_static/example/persisting_a_consensus.py", 
line 4, in 
  downloader = DescriptorDownloader()
File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 404, 
in __init__
  directories = get_authorities().values() + 
FallbackDirectory.from_cache().values()
  TypeError: unsupported operand type(s) for +: 'dict_values' and 
'dict_values'
---
 stem/descriptor/remote.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index e0923dc..f96d6a7 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -401,7 +401,7 @@ class DescriptorDownloader(object):
   def __init__(self, use_mirrors = False, **default_args):
 self._default_args = default_args
 
-directories = get_authorities().values() + 
FallbackDirectory.from_cache().values()
+directories = list(get_authorities().values()) + 
list(FallbackDirectory.from_cache().values())
 self._endpoints = [(directory.address, directory.dir_port) for directory 
in directories]
 
 if use_mirrors:



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

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

2016-02-23 Thread translation

commit 95a421a38f20c848883ecbf544a779f65dbf2a2c
Author: Translation commit bot 
Date:   Tue Feb 23 16:46:19 2016 +

Update translations for tails-iuk_completed
---
 el.po | 97 +++
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/el.po b/el.po
index 4fbcade..62d1124 100644
--- a/el.po
+++ b/el.po
@@ -11,30 +11,33 @@
 # metamec, 2015
 # stratosgl , 2014
 # Theodore Grammenos , 2014
+# TitanJack , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-01-13 14:19+0100\n"
-"PO-Revision-Date: 2015-04-23 21:35+\n"
-"Last-Translator: metamec\n"
-"Language-Team: Greek 
(http://www.transifex.com/projects/p/torproject/language/el/)\n"
+"POT-Creation-Date: 2015-12-16 18:20+0100\n"
+"PO-Revision-Date: 2016-02-23 16:21+\n"
+"Last-Translator: TitanJack \n"
+"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523
-#: ../lib/Tails/IUK/Frontend.pm:667
-msgid "For debugging information, see /home/amnesia/.xsession-errors"
-msgstr "ÎÎ¹Î± Î»ÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ ÏÏÎµÏÎ¹ÎºÎÏ Î¼Îµ ÏÎ·Î½ 
Î±ÏÎ¿ÏÏÎ±Î»Î¼Î¬ÏÏÏÎ·, Î´ÎµÎ¯ÏÎµ ÏÎ¿ home/amnesia/.xsession-errors"
+#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:522
+#: ../lib/Tails/IUK/Frontend.pm:662
+msgid ""
+"For debugging information, execute the following command: sudo tails-"
+"debugging-info"
+msgstr "ÎÎ¹Î± ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î±ÏÎ¿ÏÏÎ±Î»Î¼Î¬ÏÏÏÎ·Ï, 
ÏÏÎÎ¾ÏÎµ ÏÎ·Î½ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÎµÎ½ÏÎ¿Î»Î®:  sudo tails-debugging-info"
 
-#: ../lib/Tails/IUK/Frontend.pm:216
+#: ../lib/Tails/IUK/Frontend.pm:215
 msgid "Error while checking for upgrades"
 msgstr "Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ¿Î½ ÎÎ»ÎµÎ³ÏÎ¿ Î³Î¹Î± 
Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏÎµÎ¹Ï"
 
-#: ../lib/Tails/IUK/Frontend.pm:219
+#: ../lib/Tails/IUK/Frontend.pm:218
 msgid ""
 "Could not determine whether an upgrade is available from our 
website.\n"
 "\n"
@@ -43,64 +46,64 @@ msgid ""
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 msgstr "ÎÎµ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÏ Î½Î± ÏÏÎ¿ÏÎ´Î¹Î¿ÏÎ¹ÏÏÎµÎ¯ Î±Î½ Ï
ÏÎ¬ÏÏÎµÎ¹ Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î· Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏÎ·.\n\nÎÎ»ÎÎ³Î¾ÏÎµ 
ÏÎ· ÏÏÎ½Î´ÎµÏÎ· Î´Î¹ÎºÏÏÎ¿Ï ÏÎ±Ï ÎºÎ±Î¹ ÎºÎ¬Î½ÏÎµ 
ÎµÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ· Î³Î¹Î± Î½Î± ÎµÏÎ±Î½Î±Î»Î·ÏÎ¸ÎµÎ¯ Î· 
ÏÏÎ¿ÏÏÎ¬Î¸ÎµÎ¹Î± Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏÎ·Ï.\n\nÎÎ½ ÏÎ¿ ÏÏÏÎ²Î»Î·Î¼Î± ÏÏ
Î½ÎµÏÎ¹ÏÏÎµÎ¯, ÏÎ·Î³Î±Î¯Î½ÎµÏÎµ ÏÏÎ¿ 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
 
-#: ../lib/Tails/IUK/Frontend.pm:234
+#: ../lib/Tails/IUK/Frontend.pm:233
 msgid "no automatic upgrade is available from our website for this version"
 msgstr "Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î±ÏÏÏÎ¼Î±ÏÎ· Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏÎ· 
Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î· Î±ÏÏ ÏÎ¿Î½ Î¹ÏÏÏÏÎ¿ÏÎ¿ ÏÎ¿Ï Tails Î³Î¹Î± Î±ÏÏÎ® 
ÏÎ·Î½ ÎÎºÎ´Î¿ÏÎ·."
 
-#: ../lib/Tails/IUK/Frontend.pm:240
+#: ../lib/Tails/IUK/Frontend.pm:239
 msgid "your device was not created using Tails Installer"
 msgstr "Î· ÏÏÏÎºÎµÏÎ® Î´Îµ ÎÏÎµÎ¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î·Î¸ÎµÎ¯ Î¼Îµ ÏÎ¿ Î 
ÏÏÎ³ÏÎ±Î¼Î¼Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎ¿Ï Tails"
 
-#: ../lib/Tails/IUK/Frontend.pm:245
+#: ../lib/Tails/IUK/Frontend.pm:244
 msgid "Tails was started from a DVD or a read-only device"
 msgstr "Î¤Î¿ Tails ÎÏÎµÎ¹ ÎµÎºÎºÎ¹Î½Î·Î¸ÎµÎ¯ Î±ÏÏ DVD Î® Î±ÏÏ Î¼Î¹Î± 
Î¼Î·-ÎµÎ³Î³ÏÎ¬ÏÎ¹Î¼Î· ÏÏÏÎºÎµÏÎ®."
 
-#: ../lib/Tails/IUK/Frontend.pm:250
+#: ../lib/Tails/IUK/Frontend.pm:249
 msgid "there is not enough free space on the Tails system partition"
 msgstr "Î´ÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î±ÏÎºÎµÏÏÏ ÏÏÏÎ¿Ï ÏÏÎ¿ Î´Î¯ÏÎºÎ¿"
 
-#: ../lib/Tails/IUK/Frontend.pm:255
+#: ../lib/Tails/IUK/Frontend.pm:254
 msgid "not enough memory is available on this system"
 msgstr "ÏÎ¿ ÏÏÏÏÎ·Î¼Î± Î´ÎµÎ½ ÎÏÎµÎ¹ Î±ÏÎºÎµÏÎ® Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î· 
Î¼Î½Î®Î¼Î·"
 
-#: ../lib/Tails/IUK/Frontend.pm:261
+#: ../lib/Tails/IUK/Frontend.pm:260
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
 msgstr "ÎÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î· ÎµÎ¾Î·Î³Î·ÏÎ· Î³Î¹Î± 
'%{reason}'."
 
-#: ../lib/Tails/IUK/Frontend.pm:281
+#: ../lib/Tails/IUK/Frontend.pm:280
 msgid "The system is up-to-date"
 msgstr "Î¤Î¿ ÏÏÏÏÎ·Î¼Î± ÎµÎ¯Î½Î±Î¹ ÎµÎ½Î·Î¼ÎµÏÏÎ¼ÎÎ½Î¿."
 
-#: ../lib/Tails/IUK/Frontend.pm:286
+#: ../lib/Tails/IUK/Frontend.pm:285
 msgid "This version of Tails is outdated, and may have security issues."
 msgstr "ÎÏÏÎ® Î· ÎÎºÎ´Î¿ÏÎ· ÏÎ¿Ï Tails ÎµÎ¯Î½Î±Î¹ ÏÎ±ÏÏÏÎ·Î¼ÎÎ½Î· 
ÎºÎ±Î¹ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎµÏÎ¹ÎÏÎµÎ¹ ÎºÎµÎ½Î¬

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

2016-02-23 Thread translation

commit ed20a9d0b1a6c81185c3469768fbd0d62747fd1d
Author: Translation commit bot 
Date:   Tue Feb 23 16:45:37 2016 +

Update translations for mat-gui
---
 el.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/el.po b/el.po
index 6685bfa..58489ca 100644
--- a/el.po
+++ b/el.po
@@ -6,14 +6,15 @@
 # firespin , 2014
 # dpdt1 , 2013
 # kotkotkot , 2013
+# TitanJack , 2016
 # Wasilis Mandratzis , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-02-11 09:31+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-02-23 16:27+\n"
+"Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +78,11 @@ msgstr "ÎÎµÎ¹ÏÏÎ· ÏÎ¿Ï Î¼ÎµÎ³ÎµÎ¸Î¿ÏÏ ÎºÎ±Î¹ ÏÎ·Ï 
ÏÎ¿Î¹Î¿ÏÎ·ÏÎ±Ï Ï
 
 #: mat-gui:238
 msgid "Remove unsupported file from archives"
-msgstr ""
+msgstr "ÎÏÎ±Î¯ÏÎµÏÎ· Î¼Î· ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½ÏÎ½ Î±ÏÏÎµÎ¯ÏÎ½"
 
 #: mat-gui:241
 msgid "Remove non-supported (and so non-anonymised) file from output archive"
-msgstr ""
+msgstr "ÎÏÎ±Î¯ÏÎµÏÎ· Î¼Î·-ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½ÏÎ½ (ÎºÎ±Î¹ Î¼Î· 
Î±Î½ÏÎ½ÏÎ¼ÏÎ½) Î±ÏÏÎµÎ¯ÏÎ½ "
 
 #: mat-gui:280
 msgid "Unknown"
@@ -97,7 +98,7 @@ msgstr "ÎÎ²Î»Î±Î²Î®Ï Î¼Î¿ÏÏÎ® Î±ÏÏÎµÎ¯Î¿Ï"
 
 #: mat-gui:341
 msgid "Cant read file"
-msgstr ""
+msgstr "Î¤Î¿ Î±ÏÏÎµÎ¯Î¿ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±Î²Î±ÏÏÎµÎ¯ "
 
 #: mat-gui:343
 msgid "Fileformat not supported"

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

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

2016-02-23 Thread translation

commit 926164c9ed1b3fc6d2efddf4fbc34d5a69a33427
Author: Translation commit bot 
Date:   Tue Feb 23 16:45:41 2016 +

Update translations for mat-gui_completed
---
 el.po | 107 +++---
 1 file changed, 56 insertions(+), 51 deletions(-)

diff --git a/el.po b/el.po
index 407a5f2..58489ca 100644
--- a/el.po
+++ b/el.po
@@ -6,14 +6,15 @@
 # firespin , 2014
 # dpdt1 , 2013
 # kotkotkot , 2013
+# TitanJack , 2016
 # Wasilis Mandratzis , 2013
 msgid ""
 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-08-02 11:33+\n"
-"Last-Translator: runasand \n"
+"POT-Creation-Date: 2016-02-10 23:06+0100\n"
+"PO-Revision-Date: 2016-02-23 16:27+\n"
+"Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,167 +22,171 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mat-gui:62 mat-gui:407 mat-gui:430
+#: mat-gui:66 mat-gui:422 mat-gui:445
 msgid "Ready"
 msgstr "ÎÏÎ¿Î¹Î¼Î¿"
 
-#: mat-gui:129
+#: mat-gui:136
 msgid "Choose files"
 msgstr "ÎÏÎ¹Î»Î¿Î³Î® Î±ÏÏÎµÎ¯ÏÎ½"
 
-#: mat-gui:137
-msgid "All files"
-msgstr "ÎÎ»Î± ÏÎ± Î±ÏÏÎµÎ¯Î±"
-
-#: mat-gui:143
+#: mat-gui:144
 msgid "Supported files"
 msgstr "Î¥ÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½Î± Î±ÏÏÎµÎ¯Î±"
 
-#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428
-#: data/mat.glade:172
+#: mat-gui:151
+msgid "All files"
+msgstr "ÎÎ»Î± ÏÎ± Î±ÏÏÎµÎ¯Î±"
+
+#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443
+#: data/mat.glade:200
 msgid "Clean"
 msgstr "ÎÎºÎºÎ±Î¸Î¬ÏÎ¹ÏÎ·"
 
-#: mat-gui:161
+#: mat-gui:168
 msgid "No metadata found"
 msgstr "ÎÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎ±Î½ Î¼ÎµÏÎ±Î´ÎµÎ´Î¿Î¼ÎÎ½Î±"
 
-#: mat-gui:163 mat-gui:404
+#: mat-gui:170 mat-gui:419
 msgid "Dirty"
 msgstr "ÎÏÏÎ¼Î¹ÎºÎ¿"
 
-#: mat-gui:168
+#: mat-gui:176
 #, python-format
 msgid "%s's metadata"
 msgstr "%s ÏÏÎ½ Î¼ÎµÏÎ±Î´ÎµÎ´Î¿Î¼ÎÎ½ÏÎ½"
 
-#: mat-gui:179
+#: mat-gui:187
 msgid "Trash your meta, keep your data"
 msgstr "ÎÎ¹Î±Î³ÏÎ¬ÏÏÎµ ÏÎ± Î¼ÎµÏÎ±Î´ÎµÎ´Î¿Î¼ÎÎ½Î±, ÎºÏÎ±ÏÎ®ÏÏÎµ 
ÏÎ± Î´ÎµÎ´Î¿Î¼ÎÎ½Î±"
 
-#: mat-gui:184
+#: mat-gui:192
 msgid "Website"
 msgstr "ÎÏÏÎ¿ÏÎµÎ»Î¯Î´Î±"
 
-#: mat-gui:210
+#: mat-gui:219
 msgid "Preferences"
 msgstr "Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï"
 
-#: mat-gui:223
+#: mat-gui:232
 msgid "Reduce PDF quality"
 msgstr "ÎÎµÎ¹ÏÏÎ· ÏÎ·Ï ÏÎ¿Î¹Î¿ÏÎ·ÏÎ±Ï ÏÎ¿Ï PDF "
 
-#: mat-gui:226
+#: mat-gui:235
 msgid "Reduce the produced PDF size and quality"
 msgstr "ÎÎµÎ¹ÏÏÎ· ÏÎ¿Ï Î¼ÎµÎ³ÎµÎ¸Î¿ÏÏ ÎºÎ±Î¹ ÏÎ·Ï ÏÎ¿Î¹Î¿ÏÎ·ÏÎ±Ï 
ÏÎ¿Ï PDF "
 
-#: mat-gui:229
-msgid "Add unsupported file to archives"
-msgstr "Î ÏÎ¿ÏÎ¸Î·ÎºÎ· Î¼Î· ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶Î¿Î¼ÎµÎ½ÏÎ½ Î±ÏÏÎµÎ¹ÏÎ½ "
+#: mat-gui:238
+msgid "Remove unsupported file from archives"
+msgstr "ÎÏÎ±Î¯ÏÎµÏÎ· Î¼Î· ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½ÏÎ½ Î±ÏÏÎµÎ¯ÏÎ½"
 
-#: mat-gui:232
-msgid "Add non-supported (and so non-anonymised) file to output archive"
-msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· Î¼Î· ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶Î¿Î¼ÎµÎ½ÏÎ½ (Î¿ÏÎ¹ Î±Î½ÏÎ½Ï
Î¼ÏÎ½) Î±ÏÏÎµÎ¹ÏÎ½ ÏÏÎ¿ Î±ÏÏÎµÎ¯Î¿ ÎµÎ¾ÏÎ´Î¿Ï "
+#: mat-gui:241
+msgid "Remove non-supported (and so non-anonymised) file from output archive"
+msgstr "ÎÏÎ±Î¯ÏÎµÏÎ· Î¼Î·-ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½ÏÎ½ (ÎºÎ±Î¹ Î¼Î· 
Î±Î½ÏÎ½ÏÎ¼ÏÎ½) Î±ÏÏÎµÎ¯ÏÎ½ "
 
-#: mat-gui:271
+#: mat-gui:280
 msgid "Unknown"
 msgstr "ÎÎ³Î½ÏÏÏÎ¿"
 
-#: mat-gui:314
+#: mat-gui:325
 msgid "Not-supported"
 msgstr "ÎÎ·-ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½Î¿"
 
-#: mat-gui:328
+#: mat-gui:339
 msgid "Harmless fileformat"
 msgstr "ÎÎ²Î»Î±Î²Î®Ï Î¼Î¿ÏÏÎ® Î±ÏÏÎµÎ¯Î¿Ï"
 
-#: mat-gui:330
+#: mat-gui:341
+msgid "Cant read file"
+msgstr "Î¤Î¿ Î±ÏÏÎµÎ¯Î¿ Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±Î²Î±ÏÏÎµÎ¯ "
+
+#: mat-gui:343
 msgid "Fileformat not supported"
 msgstr "Î Î¼Î¿ÏÏÎ® Î±ÏÏÎµÎ¯Î¿Ï Î´ÎµÎ½ ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹"
 
-#: mat-gui:333
+#: mat-gui:346
 msgid "These files can not be processed:"
 msgstr "ÎÏÏÎ¬ ÏÎ± Î±ÏÏÎµÎ¯Î± Î´ÎµÎ½ Î¼ÏÎ¿ÏÎ¿ÏÎ½ Î½Î± 
ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ¿ÏÎ½:"
 
-#: mat-gui:338 mat-gui:367 data/mat.glade:211
+#: mat-gui:351 mat-gui:380 data/mat.glade:239
 msgid "Filename"
 msgstr "ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï"
 
-#: mat-gui:340
+#: mat-gui:353
 msgid "Reason"
 msgstr "ÎÏÎ³Î¿Ï"
 
-#: mat-gui:352
+#: mat-gui:365
 msgid "Non-supported files in archive"
 msgstr "ÎÎ· ÏÏÎ¿ÏÏÎ·ÏÎ¹Î¶ÏÎ¼ÎµÎ½Î± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿ Î±ÏÏÎµÎ¯Î¿."
 
-#: mat-gui:366
+#: mat-gui:379
 msgid "Include"
 msgstr "Î£ÏÎ¼ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹"
 
-#: mat-gui:382
+#: mat-gui:397
 #, python-format
 msgid "MAT is not able to clean the following files, found in the %s archive"
 msgstr

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

2016-02-23 Thread translation

commit 3eeb223bf5eea827e9585229ce55ff4aaa3949cb
Author: Translation commit bot 
Date:   Tue Feb 23 16:45:54 2016 +

Update translations for tails-misc
---
 el.po| 12 ++--
 pt_BR.po | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/el.po b/el.po
index 000ce39..9e71083 100644
--- a/el.po
+++ b/el.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 09:25+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 16:30+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -397,19 +397,19 @@ msgstr ""
 msgid "Learn more"
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Î¤Î¿ Tor Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÏÎ¿Î¹Î¼Î¿"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Î¤Î¿ Tor Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÏÎ¿Î¹Î¼Î¿. ÎÎºÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï Tor 
Browser ÏÏÏÏ ÎºÎ±Î¹ Î½Î± 'ÏÎµÎ¹;"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "ÎÎºÎºÎ¯Î½Î·ÏÎ· ÏÎ¿Ï Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "ÎÎºÏÏÎ¿Î½"
 
diff --git a/pt_BR.po b/pt_BR.po
index c2e3a75..09e730e 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2016-01-30 12:31+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 16:39+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -397,19 +397,19 @@ msgstr "Tando sistema operacional hospedeiro quanto o 
programa de virtualizaÃ§Ã£
 msgid "Learn more"
 msgstr "Saiba mais"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "O Tor nÃ£o estÃ¡ pronto"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "O Tor nÃ£o estÃ¡ pronto. Iniciar o Navegador Tor assim mesmo?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Iniciar o Navegador Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Cancelar"
 

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

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

2016-02-23 Thread translation

commit 764a4e2eac867b3cdd159782ce6867904a89b2bb
Author: Translation commit bot 
Date:   Tue Feb 23 16:45:59 2016 +

Update translations for tails-misc_completed
---
 pt_BR.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index c2e3a75..09e730e 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-25 17:49+0100\n"
-"PO-Revision-Date: 2016-01-30 12:31+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 16:39+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -397,19 +397,19 @@ msgstr "Tando sistema operacional hospedeiro quanto o 
programa de virtualizaÃ§Ã£
 msgid "Learn more"
 msgstr "Saiba mais"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "O Tor nÃ£o estÃ¡ pronto"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "O Tor nÃ£o estÃ¡ pronto. Iniciar o Navegador Tor assim mesmo?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Iniciar o Navegador Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Cancelar"
 

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

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

2016-02-23 Thread translation

commit f3793e04a59935a496b55b2d7943e622d800f28b
Author: Translation commit bot 
Date:   Tue Feb 23 16:46:14 2016 +

Update translations for tails-iuk
---
 el.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/el.po b/el.po
index 3137388..62d1124 100644
--- a/el.po
+++ b/el.po
@@ -11,13 +11,14 @@
 # metamec, 2015
 # stratosgl , 2014
 # Theodore Grammenos , 2014
+# TitanJack , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2015-12-16 18:20+0100\n"
-"PO-Revision-Date: 2015-12-17 09:10+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-02-23 16:21+\n"
+"Last-Translator: TitanJack \n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr ""
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr ""
+msgstr "ÎÎ¹Î± ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î±ÏÎ¿ÏÏÎ±Î»Î¼Î¬ÏÏÏÎ·Ï, 
ÏÏÎÎ¾ÏÎµ ÏÎ·Î½ ÏÎ±ÏÎ±ÎºÎ¬ÏÏ ÎµÎ½ÏÎ¿Î»Î®:  sudo tails-debugging-info"
 
 #: ../lib/Tails/IUK/Frontend.pm:215
 msgid "Error while checking for upgrades"

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

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

2016-02-23 Thread translation

commit 38ec28500310de44b8aac4d0b1690c14bd744299
Author: Translation commit bot 
Date:   Tue Feb 23 16:45:15 2016 +

Update translations for https_everywhere
---
 el/https-everywhere.dtd| 28 ++--
 pt_BR/https-everywhere.dtd | 12 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd
index 755085c..86c9c6b 100644
--- a/el/https-everywhere.dtd
+++ b/el/https-everywhere.dtd
@@ -3,10 +3,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -38,19 +38,19 @@
 
 
 
-
-
+
+
 
-
-
-
-
+
+
+
+
 
-
-
-
+
+
+
 
-
-
+
+
 
 
diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index cfb36fc..df58ba9 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -44,13 +44,13 @@
 
 
 
-
-
+
+
 
-
+
 
 
-
-
+
+
 
 

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

[tor-commits] [onionoo/master] Flush cached hostname when a relay's IP changes.

2016-02-23 Thread karsten

commit eedbcbe52160d0250d31bb4f6ee7644815fd989d
Author: Karsten Loesing 
Date:   Wed Feb 10 19:48:19 2016 +0100

Flush cached hostname when a relay's IP changes.

When reading a node status from disk, only remember the last lookup
time if the address has not changed.  Otherwise we'll want to do a
fresh lookup.

Implements #18270.
---
 .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java  | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
index b9552bf..d282ab8 100644
--- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -446,6 +446,12 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   if (this.knownNodes.containsKey(fingerprint)) {
 updatedNodeStatus = this.knownNodes.get(fingerprint);
 String address = nodeStatus.getAddress();
+if (address.equals(updatedNodeStatus.getAddress())) {
+  /* Only remember the last lookup time if the address has not
+   * changed.  Otherwise we'll want to do a fresh lookup. */
+  updatedNodeStatus.setLastRdnsLookup(
+  nodeStatus.getLastRdnsLookup());
+}
 int orPort = nodeStatus.getOrPort();
 int dirPort = nodeStatus.getDirPort();
 SortedSet orAddressesAndPorts =
@@ -478,8 +484,6 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   updatedNodeStatus.setFirstSeenMillis(
   nodeStatus.getFirstSeenMillis());
 }
-updatedNodeStatus.setLastRdnsLookup(
-nodeStatus.getLastRdnsLookup());
 updatedNodeStatus.setDeclaredFamily(
 nodeStatus.getDeclaredFamily());
 updatedNodeStatus.setEffectiveFamily(

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

[tor-commits] [tor/master] Document required autotools versions

2016-02-23 Thread nickm

commit 31c7a65d894c144647a2364bcad337ee5ae020ff
Author: Nick Mathewson 
Date:   Tue Feb 23 11:08:04 2016 -0500

Document required autotools versions

CentOS 6 is roughly the oldest thing we care about developers still
using, and it has autoconf 2.63 / automake 1.11.  These are both
older than openssl 1.0.0, so anybody who can't upgrade past those
probably can't upgrade to a modern openssl either.  And since only
people building from git or editing configure.ac/Makefile.am need to
use autotools, I'm not totally enthused about keeping support for
old ones anyway.

Closes ticket 17732.
---
 Makefile.am  |  5 +++--
 changes/bug17732 | 10 ++
 configure.ac |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1333f36..fe6f64b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,9 @@
 # See LICENSE for licensing information
 
 # "foreign" means we don't follow GNU package layout standards
-# 1.9 means we require automake vesion 1.9
-AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects
+# 1.11 means we require automake vesion 1.11
+# "subdir-objects" means put .o files in the same directory as the .c files
+AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/changes/bug17732 b/changes/bug17732
new file mode 100644
index 000..010645d
--- /dev/null
+++ b/changes/bug17732
@@ -0,0 +1,10 @@
+  o Minor features (compilation):
+- Note our minimum required autoconf/automake versions in the
+  appropriate locations. Closes ticket 17732.
+
+  o Dependency updates:
+- Tor now uses Autoconf version 2.63 or later, and Automake 1.11 or later
+  (released in 2008 and 2009 respectively).  If you are building Tor from
+  the git repository instead of from the source distribution, and your
+  tools are older than this, you will need to upgrade.
+  Closes ticket 17732.
diff --git a/configure.ac b/configure.ac
index aa757be..a4581e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
+AC_PREREQ([2.63])
 AC_INIT([tor],[0.2.8.1-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])

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

[tor-commits] [tor/master] avoid extra LOG_NOTICE for every new microdesc batch

2016-02-23 Thread nickm

commit 56c5e282a733912776f6dacbe4f5df66b4fb9606
Author: Roger Dingledine 
Date:   Mon Feb 22 02:55:42 2016 -0500

avoid extra LOG_NOTICE for every new microdesc batch

We already write out bootstrapping progress (see bug 9927) per new
microdesc batch. There's no need to do a full "I learned some more
directory information, but not enough to..." line each time too.
---
 src/or/directory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index b686286..7c3bfe5 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2169,7 +2169,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
   control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
   count_loading_descriptors_progress());
   if (mds && smartlist_len(mds))
-directory_info_has_arrived(now, 0, 0);
+directory_info_has_arrived(now, 0, 1);
   SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
   smartlist_free(which);
   smartlist_free(mds);



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

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug16825'

2016-02-23 Thread nickm

commit d3af4f4e43267f79239d116fd2c35e0ca9632f8b
Merge: e88686c e3eaee1
Author: Nick Mathewson 
Date:   Tue Feb 23 10:45:39 2016 -0500

Merge remote-tracking branch 'arma/bug16825'

 changes/bug16825   |  7 +++
 src/or/directory.c | 15 +--
 src/or/main.c  |  6 +++---
 src/or/main.h  |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

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

[tor-commits] [tor/master] new microdescs mean progress towards bootstrapping

2016-02-23 Thread nickm

commit c6952f65ef535b3b59dd07b947315e1ac1116c8e
Author: Roger Dingledine 
Date:   Mon Feb 22 02:47:57 2016 -0500

new microdescs mean progress towards bootstrapping

Now, when a user who has set EntryNodes finishes bootstrapping, Tor
automatically repopulates the guard set based on this new directory
information. Fixes bug 16825; bugfix on 0.2.3.1-alpha.
---
 changes/bug16825   | 7 +++
 src/or/directory.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/changes/bug16825 b/changes/bug16825
new file mode 100644
index 000..75c5627
--- /dev/null
+++ b/changes/bug16825
@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+- Count receipt of new microdescriptors as progress towards
+  bootstrapping. Now, when a user who has set EntryNodes finishes
+  bootstrapping, Tor automatically repopulates the guard set based
+  on this new directory information. Fixes bug 16825; bugfix on
+  0.2.3.1-alpha.
+
diff --git a/src/or/directory.c b/src/or/directory.c
index ecf6da8..b3af6f9 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2168,6 +2168,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
   }
   control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
   count_loading_descriptors_progress());
+  if (mds && smartlist_len(mds))
+directory_info_has_arrived(now, 0);
   SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
   smartlist_free(which);
   smartlist_free(mds);



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

[tor-commits] [tor/master] avoid redundant bootstrap events if the number of descs we just fetched is 0

2016-02-23 Thread nickm

commit e3eaee1d2cbd0bc03a40e374376ca72195a9d64d
Author: Roger Dingledine 
Date:   Mon Feb 22 03:02:01 2016 -0500

avoid redundant bootstrap events if the number of descs we just fetched is 0
---
 src/or/directory.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 7c3bfe5..964b159 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1764,7 +1764,7 @@ load_downloaded_routers(const char *body, smartlist_t 
*which,
 
   added = router_load_routers_from_string(body, NULL, SAVED_NOWHERE, which,
   descriptor_digests, buf);
-  if (general)
+  if (added && general)
 control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
 count_loading_descriptors_progress());
   return added;
@@ -2166,10 +2166,11 @@ connection_dir_client_reached_eof(dir_connection_t 
*conn)
 /* Mark remaining ones as failed. */
 dir_microdesc_download_failed(which, status_code);
   }
-  control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
-  count_loading_descriptors_progress());
-  if (mds && smartlist_len(mds))
+  if (mds && smartlist_len(mds)) {
+control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
+count_loading_descriptors_progress());
 directory_info_has_arrived(now, 0, 1);
+  }
   SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
   smartlist_free(which);
   smartlist_free(mds);



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

[tor-commits] [tor/master] refactor directory_info_has_arrived so we can quiet the logs

2016-02-23 Thread nickm

commit 43193ec888cbc15689b6db784d59c45c34a1e7f1
Author: Roger Dingledine 
Date:   Mon Feb 22 02:54:32 2016 -0500

refactor directory_info_has_arrived so we can quiet the logs

no actual behavior changes
---
 src/or/directory.c | 8 
 src/or/main.c  | 6 +++---
 src/or/main.h  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index b3af6f9..b686286 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1965,7 +1965,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
 routers_update_all_from_networkstatus(now, 3);
 update_microdescs_from_networkstatus(now);
 update_microdesc_downloads(now);
-directory_info_has_arrived(now, 0);
+directory_info_has_arrived(now, 0, 0);
 log_info(LD_DIR, "Successfully loaded consensus.");
   }
 
@@ -2001,7 +2001,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
  * ones got flushed to disk so it's safe to call this on them */
 connection_dir_download_cert_failed(conn, status_code);
   } else {
-directory_info_has_arrived(now, 0);
+directory_info_has_arrived(now, 0, 0);
 log_info(LD_DIR, "Successfully loaded certificates from fetch.");
   }
 } else {
@@ -2115,7 +2115,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
 if (load_downloaded_routers(body, which, descriptor_digests,
 conn->router_purpose,
 conn->base_.address))
-  directory_info_has_arrived(now, 0);
+  directory_info_has_arrived(now, 0, 0);
   }
 }
 if (which) { /* mark remaining ones as failed */
@@ -2169,7 +2169,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
   control_event_bootstrap(BOOTSTRAP_STATUS_LOADING_DESCRIPTORS,
   count_loading_descriptors_progress());
   if (mds && smartlist_len(mds))
-directory_info_has_arrived(now, 0);
+directory_info_has_arrived(now, 0, 0);
   SMARTLIST_FOREACH(which, char *, cp, tor_free(cp));
   smartlist_free(which);
   smartlist_free(mds);
diff --git a/src/or/main.c b/src/or/main.c
index 408f244..96a56fc 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1002,12 +1002,12 @@ directory_all_unreachable(time_t now)
 /** This function is called whenever we successfully pull down some new
  * network statuses or server descriptors. */
 void
-directory_info_has_arrived(time_t now, int from_cache)
+directory_info_has_arrived(time_t now, int from_cache, int suppress_logs)
 {
   const or_options_t *options = get_options();
 
   if (!router_have_minimum_dir_info()) {
-int quiet = from_cache ||
+int quiet = suppress_logs || from_cache ||
 directory_too_idle_to_fetch_descriptors(options, now);
 tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
 "I learned some more directory information, but not enough to "
@@ -2391,7 +2391,7 @@ do_main_loop(void)
* appropriate.)
*/
   now = time(NULL);
-  directory_info_has_arrived(now, 1);
+  directory_info_has_arrived(now, 1, 0);
 
   if (server_mode(get_options())) {
 /* launch cpuworkers. Need to do this *after* we've read the onion key. */
diff --git a/src/or/main.h b/src/or/main.h
index 37e93d7..7407116 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -48,7 +48,7 @@ MOCK_DECL(void,connection_start_writing,(connection_t *conn));
 void connection_stop_reading_from_linked_conn(connection_t *conn);
 
 void directory_all_unreachable(time_t now);
-void directory_info_has_arrived(time_t now, int from_cache);
+void directory_info_has_arrived(time_t now, int from_cache, int suppress_logs);
 
 void ip_address_changed(int at_interface);
 void dns_servers_relaunch_checks(void);



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

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

2016-02-23 Thread translation

commit a1bb762066cb588c0bdf651382eb642edfbff621
Author: Translation commit bot 
Date:   Tue Feb 23 15:45:54 2016 +

Update translations for tails-misc_completed
---
 es.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/es.po b/es.po
index 85be497..c069286 100644
--- a/es.po
+++ b/es.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 14:12+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 15:17+\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -390,19 +390,19 @@ msgstr "Ambos, el sistema operativo anfitriÃ³n y el 
software de virtualizaciÃ³n
 msgid "Learn more"
 msgstr "Leer mÃ¡s"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor no estÃ¡ listo"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor no estÃ¡ listo. Â¿Iniciar el Navegador Tor de todos modos?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Iniciar Navegador Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Cancelar"
 

___
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

2016-02-23 Thread translation

commit 653fb5b7a86cf03b13f19faa3225bf5d7a1bb180
Author: Translation commit bot 
Date:   Tue Feb 23 15:45:49 2016 +

Update translations for tails-misc
---
 es.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/es.po b/es.po
index 85be497..c069286 100644
--- a/es.po
+++ b/es.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 14:12+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 15:17+\n"
 "Last-Translator: strel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -390,19 +390,19 @@ msgstr "Ambos, el sistema operativo anfitriÃ³n y el 
software de virtualizaciÃ³n
 msgid "Learn more"
 msgstr "Leer mÃ¡s"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor no estÃ¡ listo"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor no estÃ¡ listo. Â¿Iniciar el Navegador Tor de todos modos?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Iniciar Navegador Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Cancelar"
 

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

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

2016-02-23 Thread translation

commit 261bfdaf317136052e89481dc707638dcce9e0d8
Author: Translation commit bot 
Date:   Tue Feb 23 15:45:21 2016 +

Update translations for https_everywhere_completed
---
 es/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index d3be837..6c7527c 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2016-02-23 Thread translation

commit ff3489ad9aebf82c5d60fd39f174cbc710c31f70
Author: Translation commit bot 
Date:   Tue Feb 23 15:45:15 2016 +

Update translations for https_everywhere
---
 es/https-everywhere.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 2f1684f..6c7527c 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -44,13 +44,13 @@
 
 
 
-
+
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 

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

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

2016-02-23 Thread translation

commit 7f773e5972fed19b6fb712792380d84a03625f09
Author: Translation commit bot 
Date:   Tue Feb 23 15:15:17 2016 +

Update translations for https_everywhere
---
 ru/https-everywhere.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 78cdb4e..bfe75aa 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,10 +42,10 @@
 
 
 
-
-
-
-
+
+
+
+
 
 
 

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

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

2016-02-23 Thread translation

commit 88eb80c552b69a6926f1c519f9639a9a46f1113c
Author: Translation commit bot 
Date:   Tue Feb 23 14:15:55 2016 +

Update translations for tails-misc_completed
---
 zh_CN.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 871f4d4..024fc00 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-12 09:41+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 14:02+\n"
 "Last-Translator: YF \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -388,19 +388,19 @@ msgstr 
"ä¸»æºçæä½ç³»ç»åèæåè½¯ä»¶é½å¯è½çè§æ¨å¨ä½¿ç¨ Tails
 msgid "Learn more"
 msgstr "è¯¦ç»äºè§£"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor æªå°±ç»ª"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor æªå°±ç»ªãç¡®å®å¯å¨ Tor Browserï¼"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "å¯å¨ Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "åæ¶"
 

___
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

2016-02-23 Thread translation

commit 254410e8d0aef6b415f756e9876a71f9b5038e09
Author: Translation commit bot 
Date:   Tue Feb 23 14:15:51 2016 +

Update translations for tails-misc
---
 zh_CN.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index 871f4d4..024fc00 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-12 09:41+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 14:02+\n"
 "Last-Translator: YF \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -388,19 +388,19 @@ msgstr 
"ä¸»æºçæä½ç³»ç»åèæåè½¯ä»¶é½å¯è½çè§æ¨å¨ä½¿ç¨ Tails
 msgid "Learn more"
 msgstr "è¯¦ç»äºè§£"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor æªå°±ç»ª"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor æªå°±ç»ªãç¡®å®å¯å¨ Tor Browserï¼"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "å¯å¨ Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "åæ¶"
 

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

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

2016-02-23 Thread translation

commit 82f9b7b14c9ea9ad346b55c3d9f3414c27c7ac39
Author: Translation commit bot 
Date:   Tue Feb 23 14:15:23 2016 +

Update translations for https_everywhere_completed
---
 zh-CN/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd
index 79aa651..cb9d724 100644
--- a/zh-CN/https-everywhere.dtd
+++ b/zh-CN/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2016-02-23 Thread translation

commit b641703cd4f85dd5812d12464e32b6bdd8c58208
Author: Translation commit bot 
Date:   Tue Feb 23 14:15:16 2016 +

Update translations for https_everywhere
---
 es/https-everywhere.dtd| 10 +-
 zh-CN/https-everywhere.dtd | 22 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index cad8e46..2f1684f 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,10 +42,10 @@
 
 
 
-
-
-
-
+
+
+
+
 
 
 
diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd
index 6df446a..cb9d724 100644
--- a/zh-CN/https-everywhere.dtd
+++ b/zh-CN/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
 

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

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

2016-02-23 Thread translation

commit a9b9b7b8d8057428409e3116604184077262
Author: Translation commit bot 
Date:   Tue Feb 23 12:45:16 2016 +

Update translations for https_everywhere
---
 fr_CA/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd
index dd12b16..494bde7 100644
--- a/fr_CA/https-everywhere.dtd
+++ b/fr_CA/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18348-v2'

2016-02-23 Thread nickm

commit e88686cb2cbae39333982505f38f2d7568af4f32
Merge: 48c1c02 0ba672a
Author: Nick Mathewson 
Date:   Tue Feb 23 07:36:56 2016 -0500

Merge remote-tracking branch 'teor/bug18348-v2'

 changes/bug18348   |   5 +
 src/or/connection.c|   7 +
 src/or/directory.c |   2 +-
 src/or/entrynodes.c|   7 +-
 src/or/nodelist.c  |   5 +
 src/or/or.h|   4 +-
 src/or/policies.c  | 318 +++---
 src/or/policies.h  |  28 ++-
 src/or/routerlist.c|   4 +-
 src/test/test_policy.c | 522 -
 10 files changed, 543 insertions(+), 359 deletions(-)

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

[tor-commits] [tor/master] Changes file for bug 18348.

2016-02-23 Thread nickm

commit 0ba672a7fdb952c612ee9215bd7e8a6b02f4f8f7
Author: teor (Tim Wilson-Brown) 
Date:   Sun Feb 21 00:03:56 2016 +1100

Changes file for bug 18348.
---
 changes/bug18348 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug18348 b/changes/bug18348
new file mode 100644
index 000..03978ed
--- /dev/null
+++ b/changes/bug18348
@@ -0,0 +1,5 @@
+  o Major bug fixes (relays, bridge clients):
+- Ensure relays always allow IPv4 OR and Dir connections.
+  Ensure bridge clients use the address configured in the bridge line.
+  Fixes bug 18348; bugfix on 0.2.8.1-alpha.
+  Reported by sysrqb, patch by teor.



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

[tor-commits] [tor/master] Update unit tests for fascist_firewall_choose_address*

2016-02-23 Thread nickm

commit d359cfab138b89b41a7eb77e904d3fa4071930c2
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 23:23:29 2016 +1100

Update unit tests for fascist_firewall_choose_address*

Check that clients, bridge clients, and relays choose addresses
as expected.
---
 src/test/test_policy.c | 522 -
 1 file changed, 347 insertions(+), 175 deletions(-)

diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index 3688909..84a7081 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -1374,6 +1374,51 @@ test_policies_fascist_firewall_allows_address(void *arg)
 #define TEST_IPV6_OR_PORT  61234
 #define TEST_IPV6_DIR_PORT 62345
 
+/* Check that fascist_firewall_choose_address_rs() returns the expected
+ * results. */
+#define CHECK_CHOSEN_ADDR_RS(fake_rs, fw_connection, pref_only, expect_rv, \
+ expect_ap) \
+  STMT_BEGIN \
+tor_addr_port_t chosen_rs_ap; \
+tor_addr_make_null(_rs_ap.addr, AF_INET); \
+chosen_rs_ap.port = 0; \
+tt_int_op(fascist_firewall_choose_address_rs(&(fake_rs), \
+ (fw_connection), \
+ (pref_only), \
+ _rs_ap), \
+  OP_EQ, (expect_rv)); \
+tt_assert(tor_addr_eq(&(expect_ap).addr, _rs_ap.addr)); \
+tt_int_op((expect_ap).port, OP_EQ, chosen_rs_ap.port); \
+  STMT_END
+
+/* Check that fascist_firewall_choose_address_node() returns the expected
+ * results. */
+#define CHECK_CHOSEN_ADDR_NODE(fake_node, fw_connection, pref_only, \
+   expect_rv, expect_ap) \
+  STMT_BEGIN \
+tor_addr_port_t chosen_node_ap; \
+tor_addr_make_null(_node_ap.addr, AF_INET); \
+chosen_node_ap.port = 0; \
+tt_int_op(fascist_firewall_choose_address_node(&(fake_node), \
+   (fw_connection), \
+   (pref_only), \
+   _node_ap), \
+  OP_EQ, (expect_rv)); \
+tt_assert(tor_addr_eq(&(expect_ap).addr, _node_ap.addr)); \
+tt_int_op((expect_ap).port, OP_EQ, chosen_node_ap.port); \
+  STMT_END
+
+/* Check that fascist_firewall_choose_address_rs and
+ * fascist_firewall_choose_address_node() both return the expected results. */
+#define CHECK_CHOSEN_ADDR_RN(fake_rs, fake_node, fw_connection, pref_only, \
+ expect_rv, expect_ap) \
+  STMT_BEGIN \
+CHECK_CHOSEN_ADDR_RS(fake_rs, fw_connection, pref_only, expect_rv, \
+ expect_ap); \
+CHECK_CHOSEN_ADDR_NODE(fake_node, fw_connection, pref_only, expect_rv, \
+   expect_ap); \
+  STMT_END
+
 /** Run unit tests for fascist_firewall_choose_address */
 static void
 test_policies_fascist_firewall_choose_address(void *arg)
@@ -1402,91 +1447,196 @@ test_policies_fascist_firewall_choose_address(void 
*arg)
   tor_addr_make_null(_ipv6_ap.addr, AF_INET6);
   n_ipv6_ap.port = 0;
 
-  /* Choose an address with IPv4 and IPv6 on */
+  /* Sanity check fascist_firewall_choose_address with IPv4 and IPv6 on */
   memset(_options, 0, sizeof(or_options_t));
   mock_options.ClientUseIPv4 = 1;
   mock_options.ClientUseIPv6 = 1;
   mock_options.UseBridges = 0;
 
-  /* Preferring IPv4 */
-  mock_options.ClientPreferIPv6ORPort = 0;
-  mock_options.ClientPreferIPv6DirPort = 0;
-  tt_assert(fascist_firewall_choose_address(_or_ap, _or_ap, 0,
- FIREWALL_OR_CONNECTION, 0)
+  /* Prefer IPv4 */
+  tt_assert(fascist_firewall_choose_address(_or_ap, _or_ap, 1,
+FIREWALL_OR_CONNECTION, 0, 0)
 == _or_ap);
-  tt_assert(fascist_firewall_choose_address(_or_ap, _or_ap, 0,
- FIREWALL_OR_CONNECTION, 1)
+  tt_assert(fascist_firewall_choose_address(_or_ap, _or_ap, 1,
+FIREWALL_OR_CONNECTION, 1, 0)
 == _or_ap);
-  tt_assert(fascist_firewall_choose_address(_dir_ap, _dir_ap, 0,
- FIREWALL_DIR_CONNECTION, 0)
+  tt_assert(fascist_firewall_choose_address(_dir_ap, _dir_ap, 1,
+FIREWALL_DIR_CONNECTION, 0, 0)
 == _dir_ap);
-  tt_assert(fascist_firewall_choose_address(_dir_ap, _dir_ap, 0,
- FIREWALL_DIR_CONNECTION, 1)
+  tt_assert(fascist_firewall_choose_address(_dir_ap, _dir_ap, 1,
+FIREWALL_DIR_CONNECTION, 1, 0)
 == _dir_ap);
 
-  /* Auto (Preferring IPv4) */
-  mock_options.ClientPreferIPv6ORPort = -1;
-  mock_options.ClientPreferIPv6DirPort = -1;
-  tt_assert(fascist_firewall_choose_address(_or_ap, _or_ap, 0,
-

[tor-commits] [tor/master] Downgrade directory preference warning to info level

2016-02-23 Thread nickm

commit be16c16bdaae9ac1ebddbe755236e62de9011f01
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 23:22:27 2016 +1100

Downgrade directory preference warning to info level
---
 src/or/routerlist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f666270..25038ac 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1566,14 +1566,14 @@ router_picked_poor_directory_log(const routerstatus_t 
*rs)
   } else if (!fascist_firewall_allows_rs(rs, FIREWALL_OR_CONNECTION, 1)
  && !fascist_firewall_allows_rs(rs, FIREWALL_DIR_CONNECTION, 1)
  ) {
-log_warn(LD_BUG, "Selected a directory %s with non-preferred OR and Dir "
+log_info(LD_BUG, "Selected a directory %s with non-preferred OR and Dir "
  "addresses for launching a connection: "
  "IPv4 %s OR %d Dir %d IPv6 %s OR %d Dir %d",
  routerstatus_describe(rs),
  fmt_addr32(rs->addr), rs->or_port,
  rs->dir_port, fmt_addr(>ipv6_addr),
  rs->ipv6_orport, rs->dir_port);
-log_backtrace(LOG_WARN, LD_BUG, "Node search initiated by");
+log_backtrace(LOG_INFO, LD_BUG, "Node search initiated by");
   }
 }
 



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

[tor-commits] [tor/master] Ensure relays must use IPv4, and can use IPv6

2016-02-23 Thread nickm

commit 25543387ede5a4143d9ef4fdff2b34846ca788c6
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 19:28:51 2016 +1100

Ensure relays must use IPv4, and can use IPv6

A mistake in previous refactoring had relays using IPv4 and IPv6.
---
 src/or/policies.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index 179230b..2c24555 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -408,13 +408,12 @@ fascist_firewall_allows_address(const tor_addr_t *addr,
 if (tor_addr_family(addr) == AF_INET &&
 (!options->ClientUseIPv4 || (pref_only && pref_ipv6)))
   return 0;
-
-/* Bridges can always use IPv6 */
-if (tor_addr_family(addr) == AF_INET6 &&
-(!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6)))
-  return 0;
   }
 
+  if (tor_addr_family(addr) == AF_INET6 &&
+  (!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6)))
+return 0;
+
   return addr_policy_permits_tor_addr(addr, port,
   firewall_policy);
 }



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

[tor-commits] [tor/master] Make some fascist_firewall_choose_address* functions static

2016-02-23 Thread nickm

commit a4853f1bc1815a185702ef197c002e89d82dbee0
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 20:09:07 2016 +1100

Make some fascist_firewall_choose_address* functions static
---
 src/or/policies.c |  6 +++---
 src/or/policies.h | 24 ++--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index e8f4a82..3fe0a41 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -540,7 +540,7 @@ fascist_firewall_allows_address_addr(const tor_addr_t 
*addr, uint16_t port,
  * If pref_only, return false if addr is not in the client's preferred address
  * family.
  */
-int
+static int
 fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
firewall_connection_t fw_connection,
int pref_only)
@@ -556,7 +556,7 @@ fascist_firewall_allows_address_ap(const tor_addr_port_t 
*ap,
  * fw_connection.
  * If pref_only, return false if addr is not in the client's preferred address
  * family. */
-int
+static int
 fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
   uint16_t ipv4_or_port,
   firewall_connection_t fw_connection,
@@ -784,7 +784,7 @@ fascist_firewall_choose_address_impl(const tor_addr_port_t 
*a,
  *choose one based on want_a and return it.
  *  - Otherwise, return whichever is preferred.
  * Otherwise, return NULL. */
-const tor_addr_port_t *
+STATIC const tor_addr_port_t *
 fascist_firewall_choose_address(const tor_addr_port_t *a,
 const tor_addr_port_t *b,
 int want_a,
diff --git a/src/or/policies.h b/src/or/policies.h
index 65f10e2..8b330eb 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -35,16 +35,11 @@ int fascist_firewall_use_ipv6(const or_options_t *options);
 int fascist_firewall_prefer_ipv6_orport(const or_options_t *options);
 int fascist_firewall_prefer_ipv6_dirport(const or_options_t *options);
 
-int fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port,
+int fascist_firewall_allows_address_addr(const tor_addr_t *addr,
+ uint16_t port,
  firewall_connection_t fw_connection,
  int pref_only);
-int fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
-   firewall_connection_t fw_connection,
-   int pref_only);
-int fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
-  uint16_t ipv4_or_port,
-  firewall_connection_t fw_connection,
-  int pref_only);
+
 int fascist_firewall_allows_rs(const routerstatus_t *rs,
firewall_connection_t fw_connection,
int pref_only);
@@ -55,12 +50,6 @@ int fascist_firewall_allows_dir_server(const dir_server_t 
*ds,
firewall_connection_t fw_connection,
int pref_only);
 
-const tor_addr_port_t * fascist_firewall_choose_address(
-  const tor_addr_port_t *a,
-  const tor_addr_port_t *b,
-  int want_a,
-  firewall_connection_t fw_connection,
-  int pref_only);
 int fascist_firewall_choose_address_rs(const routerstatus_t *rs,
firewall_connection_t fw_connection,
int pref_only, tor_addr_port_t* ap);
@@ -140,6 +129,13 @@ STATIC int fascist_firewall_allows_address(const 
tor_addr_t *addr,
uint16_t port,
smartlist_t *firewall_policy,
int pref_only, int pref_ipv6);
+STATIC const tor_addr_port_t * fascist_firewall_choose_address(
+  const tor_addr_port_t *a,
+  const tor_addr_port_t *b,
+  int want_a,
+  firewall_connection_t fw_connection,
+  int pref_only);
+
 #endif
 
 #endif



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

[tor-commits] [tor/master] Refactor IPV6_OR_LOOKUP into fascist_firewall_choose_address_rs

2016-02-23 Thread nickm

commit 4afb107278f528b9002415709d7a0003106ff70c
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 20:12:17 2016 +1100

Refactor IPV6_OR_LOOKUP into fascist_firewall_choose_address_rs

It's only used once now, so having it as a macro is unhelpful.
---
 src/or/policies.c | 29 -
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index 3fe0a41..21364ed 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -883,22 +883,6 @@ fascist_firewall_choose_address_ipv4h(uint32_t ipv4h_addr,
   fw_connection, pref_only, ap);
 }
 
-#define IPV6_OR_LOOKUP(r, identity_digest, ipv6_or_ap) \
-  STMT_BEGIN \
-if (!(r)->ipv6_orport || tor_addr_is_null(&(r)->ipv6_addr)) { \
-  const node_t *node = node_get_by_id((identity_digest)); \
-  if (node) { \
-node_get_pref_ipv6_orport(node, &(ipv6_or_ap)); \
-  } else { \
-tor_addr_make_null(&(ipv6_or_ap).addr, AF_INET6); \
-(ipv6_or_ap).port = 0; \
-  } \
-} else { \
-  tor_addr_copy(&(ipv6_or_ap).addr, &(r)->ipv6_addr); \
-  (ipv6_or_ap).port = (r)->ipv6_orport; \
-} \
-  STMT_END
-
 /** Copy an address and port from rs into ap that we think our
  * firewall will let us connect to. Uses ipv4h_addr/ipv6_addr and
  * ipv4_orport/ipv6_orport/ReachableORAddresses or
@@ -922,7 +906,18 @@ fascist_firewall_choose_address_rs(const routerstatus_t 
*rs,
   /* Don't do the lookup if the IPv6 address/port in rs is OK.
* If it's OK, assume the dir_port is also OK. */
   tor_addr_port_t ipv6_or_ap;
-  IPV6_OR_LOOKUP(rs, rs->identity_digest, ipv6_or_ap);
+  if (!rs->ipv6_orport || tor_addr_is_null(>ipv6_addr)) {
+const node_t *node = node_get_by_id(rs->identity_digest);
+if (node) {
+  node_get_pref_ipv6_orport(node, _or_ap);
+} else {
+  tor_addr_make_null(_or_ap.addr, AF_INET6);
+  ipv6_or_ap.port = 0;
+}
+  } else {
+tor_addr_copy(_or_ap.addr, >ipv6_addr);
+ipv6_or_ap.port = rs->ipv6_orport;
+  }
 
   /* Assume IPv4 and IPv6 DirPorts are the same.
* Assume the IPv6 OR and Dir addresses are the same. */



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

[tor-commits] [tor/master] If both IPv4 and IPv6 addresses could be used, choose one correctly

2016-02-23 Thread nickm

commit c281c0365482891d6c3e71f85b2a6615faa5990b
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 20:04:01 2016 +1100

If both IPv4 and IPv6 addresses could be used, choose one correctly

If there is a node, use node_ipv6_or/dir_preferred().
If there is no node, use fascist_firewall_prefer_ipv6_or/dirport().
---
 src/or/connection.c |   7 ++
 src/or/directory.c  |   2 +-
 src/or/entrynodes.c |   7 +-
 src/or/nodelist.c   |   5 +
 src/or/or.h |   4 +-
 src/or/policies.c   | 280 ++--
 src/or/policies.h   |   6 +-
 7 files changed, 161 insertions(+), 150 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index a1e9850..0f2b3e3 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1763,6 +1763,13 @@ connection_connect_log_client_use_ip_version(const 
connection_t *conn)
 log_backtrace(LOG_WARN, LD_BUG, "Address came from");
   }
 
+  /* Bridges are allowed to break IPv4/IPv6 ORPort preferences to connect to
+   * the node's configured address when ClientPreferIPv6ORPort is auto */
+  if (options->UseBridges && conn->type == CONN_TYPE_OR
+  && options->ClientPreferIPv6ORPort == -1) {
+return;
+  }
+
   /* Check if we couldn't satisfy an address family preference */
   if ((!pref_ipv6 && tor_addr_family(_addr) == AF_INET6)
   || (pref_ipv6 && tor_addr_family(_addr) == AF_INET)) {
diff --git a/src/or/directory.c b/src/or/directory.c
index ecf6da8..9a05b52 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -972,7 +972,7 @@ directory_command_should_use_begindir(const or_options_t 
*options,
 return 0;
   if (indirection == DIRIND_ONEHOP)
 if (!fascist_firewall_allows_address_addr(addr, or_port,
-  FIREWALL_OR_CONNECTION, 0) ||
+  FIREWALL_OR_CONNECTION, 0, 0) ||
 directory_fetches_from_authorities(options))
   return 0; /* We're firewalled or are acting like a relay -- also no. */
   return 1;
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 95d9fec..771a0ef 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2121,9 +2121,9 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t 
*bridge)
   }
 
   /* Until we get a descriptor for the bridge, we only know one address for
-   * it. If we  */
+   * it. */
   if (!fascist_firewall_allows_address_addr(>addr, bridge->port,
-FIREWALL_OR_CONNECTION, 0)) {
+FIREWALL_OR_CONNECTION, 0, 0)) {
 log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a "
"bridge, but that bridge is not reachable through our "
"firewall.");
@@ -2193,7 +2193,8 @@ fetch_bridge_descriptors(const or_options_t *options, 
time_t now)
 
   if (ask_bridge_directly &&
   !fascist_firewall_allows_address_addr(>addr, bridge->port,
-FIREWALL_OR_CONNECTION, 0)) {
+FIREWALL_OR_CONNECTION, 0,
+0)) {
 log_notice(LD_DIR, "Bridge at '%s' isn't reachable by our "
"firewall policy. %s.",
fmt_addrport(>addr, bridge->port),
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 23e9b0e..91353ee 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -981,6 +981,9 @@ node_has_ipv6_dirport(const node_t *node)
  *  i) the node_t says that it prefers IPv6
  *  or
  *  ii) the router has no IPv4 OR address.
+ *
+ * If you don't have a node, consider looking it up.
+ * If there is no node, use fascist_firewall_prefer_ipv6_orport().
  */
 int
 node_ipv6_or_preferred(const node_t *node)
@@ -1078,6 +1081,8 @@ node_get_pref_ipv6_orport(const node_t *node, 
tor_addr_port_t *ap_out)
  *  i) the router has no IPv4 Dir address.
  *  or
  *  ii) our preference is for IPv6 Dir addresses.
+ *
+ * If there is no node, use fascist_firewall_prefer_ipv6_dirport().
  */
 int
 node_ipv6_dir_preferred(const node_t *node)
diff --git a/src/or/or.h b/src/or/or.h
index f438212..368adab 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4092,8 +4092,8 @@ typedef struct {
   int ClientUseIPv6;
   /** If true, prefer an IPv6 OR port over an IPv4 one for entry node
* connections. If auto, bridge clients prefer IPv6, and other clients
-   * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of
-   * accessing this value directly. */
+   * prefer IPv4. Use node_ipv6_or_preferred() instead of accessing this value
+   * directly. */
   int ClientPreferIPv6ORPort;
   /** If true, prefer an IPv6 directory port over an IPv4 one for direct
* directory connections. If auto, bridge clients prefer IPv6, and other
diff --git a/src/or/policies.c b/src/or/policies.c
index 21364ed..5a97c7a 100644
--- a/src/or/policies.c
+++

[tor-commits] [tor/master] Refactor fascist_firewall_allows_address without changing behaviour

2016-02-23 Thread nickm

commit a4eddfff666226014545efd6f5bf390173c0fdfa
Author: teor (Tim Wilson-Brown) 
Date:   Sat Feb 20 19:32:33 2016 +1100

Refactor fascist_firewall_allows_address without changing behaviour
---
 src/or/policies.c | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index 2c24555..e8f4a82 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -399,20 +399,26 @@ fascist_firewall_allows_address(const tor_addr_t *addr,
 int pref_only, int pref_ipv6)
 {
   const or_options_t *options = get_options();
+  const int client_mode = !server_mode(options);
 
   if (!addr || tor_addr_is_null(addr) || !port) {
 return 0;
   }
 
-  if (!server_mode(options)) {
-if (tor_addr_family(addr) == AF_INET &&
-(!options->ClientUseIPv4 || (pref_only && pref_ipv6)))
-  return 0;
+  /* Clients stop using IPv4 if it's disabled. In most cases, clients also
+   * stop using IPv4 if it's not preferred.
+   * Servers must have IPv4 enabled and preferred. */
+  if (tor_addr_family(addr) == AF_INET && client_mode &&
+  (!options->ClientUseIPv4 || (pref_only && pref_ipv6))) {
+return 0;
   }
 
+  /* Clients and Servers won't use IPv6 unless it's enabled (and in most
+   * cases, IPv6 must also be preferred before it will be used). */
   if (tor_addr_family(addr) == AF_INET6 &&
-  (!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6)))
+  (!fascist_firewall_use_ipv6(options) || (pref_only && !pref_ipv6))) {
 return 0;
+  }
 
   return addr_policy_permits_tor_addr(addr, port,
   firewall_policy);



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

[tor-commits] [tor/master] Simple fix for integer overflow in smartlist_heapify.

2016-02-23 Thread nickm

commit 21f72990dbd2fb1fa98261a39544771a43ee422a
Author: Nick Mathewson 
Date:   Wed Feb 17 14:19:47 2016 -0500

Simple fix for integer overflow in smartlist_heapify.
---
 changes/bug18296   |  4 
 src/common/container.c | 22 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/changes/bug18296 b/changes/bug18296
new file mode 100644
index 000..1e98200
--- /dev/null
+++ b/changes/bug18296
@@ -0,0 +1,4 @@
+  o Minor bugfixes (containers):
+- If we somehow attempt to construct a heap with more than
+  1073741822 elements, avoid an integer overflow when maintaining
+  the heap property.  Fixes bug 18296; bugfix on 0.1.2.1-alpha.
diff --git a/src/common/container.c b/src/common/container.c
index 2e42c9e..1de8e7d 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -840,9 +840,17 @@ smartlist_sort_pointers(smartlist_t *sl)
  *
  * For a 1-indexed array, we would use LEFT_CHILD[x] = 2*x and RIGHT_CHILD[x]
  *   = 2*x + 1.  But this is C, so we have to adjust a little. */
-//#define LEFT_CHILD(i)  ( ((i)+1)*2 - 1)
-//#define RIGHT_CHILD(i) ( ((i)+1)*2 )
-//#define PARENT(i)  ( ((i)+1)/2 - 1)
+
+/* MAX_PARENT_IDX is the largest IDX in the smartlist which might have
+ * children whose indices fit inside an int.
+ * LEFT_CHILD(MAX_PARENT_IDX) == INT_MAX-2;
+ * RIGHT_CHILD(MAX_PARENT_IDX) == INT_MAX-1;
+ * LEFT_CHILD(MAX_PARENT_IDX + 1) == INT_MAX // impossible, see max list size.
+ */
+#define MAX_PARENT_IDX ((INT_MAX - 2) / 2)
+/* If this is true, then i is small enough to potentially have children
+ * in the smartlist, and it is save to use LEFT_CHILD/RIGHT_CHILD on it. */
+#define IDX_MAY_HAVE_CHILDREN(i) ((i) <= MAX_PARENT_IDX)
 #define LEFT_CHILD(i)  ( 2*(i) + 1 )
 #define RIGHT_CHILD(i) ( 2*(i) + 2 )
 #define PARENT(i)  ( ((i)-1) / 2 )
@@ -876,6 +884,14 @@ smartlist_heapify(smartlist_t *sl,
   int idx)
 {
   while (1) {
+if (! IDX_MAY_HAVE_CHILDREN(idx)) {
+  /* idx is so large that it cannot have any children, since doing so
+   * would mean the smartlist was over-capacity. Therefore it cannot
+   * violate the heap property by being greater than a child (since it
+   * doesn't have any). */
+  return;
+}
+
 int left_idx = LEFT_CHILD(idx);
 int best_idx;
 



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

[tor-commits] [tor/master] Merge branch 'bug18296_squashed'

2016-02-23 Thread nickm

commit 48c1c028ca65c9fbdb83f47e5ccda0469b031bdd
Merge: 882e0fb 21f7299
Author: Nick Mathewson 
Date:   Tue Feb 23 07:32:18 2016 -0500

Merge branch 'bug18296_squashed'

 changes/bug18296   |  4 
 src/common/container.c | 22 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Another automated rename.

2016-02-23 Thread nickm

commit 9746aed2baffeb3788552f8cdedc5611ab2f91b7
Author: Nick Mathewson 
Date:   Wed Feb 10 15:31:43 2016 -0500

Another automated rename.

Also simplify crypto_common_digests() to have no loop.
---
 src/common/crypto.c| 23 ---
 src/common/crypto.h|  2 +-
 src/common/tortls.c|  2 +-
 src/test/test_crypto.c |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 2ebf203..6c40c6e 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1323,7 +1323,7 @@ crypto_pk_get_digest(const crypto_pk_t *pk, char 
*digest_out)
 /** Compute all digests of the DER encoding of pk, and store them
  * in digests_out.  Return 0 on success, -1 on failure. */
 int
-crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out)
+crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out)
 {
   unsigned char *buf = NULL;
   int len;
@@ -1650,28 +1650,13 @@ crypto_digest512(char *digest, const char *m, size_t 
len,
 int
 crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len)
 {
-  int i;
   tor_assert(ds_out);
   memset(ds_out, 0, sizeof(*ds_out));
   if (crypto_digest(ds_out->d[DIGEST_SHA1], m, len) < 0)
 return -1;
-  for (i = DIGEST_SHA256; i < N_COMMON_DIGEST_ALGORITHMS; ++i) {
-  switch (i) {
-case DIGEST_SHA256: /* FALLSTHROUGH */
-case DIGEST_SHA3_256:
-  if (crypto_digest256(ds_out->d[i], m, len, i) < 0)
-return -1;
-  break;
-case DIGEST_SHA512:
-case DIGEST_SHA3_512: /* FALLSTHROUGH */
-  tor_assert(0); /* These won't fit. */
-  if (crypto_digest512(ds_out->d[i], m, len, i) < 0)
-return -1;
-  break;
-default:
-  return -1;
-  }
-  }
+  if (crypto_digest256(ds_out->d[DIGEST_SHA256], m, len, DIGEST_SHA256) < 0)
+return -1;
+
   return 0;
 }
 
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 2aa49d3..f1e4981 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -193,7 +193,7 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char 
*to,
 int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len);
 crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len);
 int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out);
-int crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out);
+int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t 
*digests_out);
 int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space);
 int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out);
 
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 688a755..3077943 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -691,7 +691,7 @@ MOCK_IMPL(STATIC tor_x509_cert_t *,
   if ((pkey = X509_get_pubkey(x509_cert)) &&
   (rsa = EVP_PKEY_get1_RSA(pkey))) {
 crypto_pk_t *pk = crypto_new_pk_from_rsa_(rsa);
-crypto_pk_get_all_digests(pk, >pkey_digests);
+crypto_pk_get_common_digests(pk, >pkey_digests);
 cert->pkey_digests_set = 1;
 crypto_pk_free(pk);
 EVP_PKEY_free(pkey);
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 5ac20b9..14f1ecc 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1098,7 +1098,7 @@ test_crypto_digests(void *arg)
   tt_mem_op(hex_str(digest, DIGEST_LEN),OP_EQ,
  AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN);
 
-  r = crypto_pk_get_all_digests(k, _digests);
+  r = crypto_pk_get_common_digests(k, _digests);
 
   tt_mem_op(hex_str(pkey_digests.d[DIGEST_SHA1], DIGEST_LEN),OP_EQ,
  AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN);



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

[tor-commits] [tor/master] Whitespace fixes

2016-02-23 Thread nickm

commit a8d69895897056fcc313914e9d611d3c9008e17c
Author: Nick Mathewson 
Date:   Wed Feb 10 15:35:46 2016 -0500

Whitespace fixes
---
 src/common/crypto.h  | 4 ++--
 src/common/tortls.h  | 6 --
 src/or/channeltls.c  | 3 ++-
 src/or/dirserv.h | 6 +++---
 src/or/routerparse.c | 3 ++-
 src/or/routerparse.h | 3 ++-
 src/test/test_dir.c  | 6 --
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/common/crypto.h b/src/common/crypto.h
index f1e4981..9535c4e 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -102,7 +102,6 @@ typedef enum {
 #define  N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1)
 #define  N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1)
 
-
 /** A set of all the digests we commonly compute, taken on a single
  * string.  Any digests that are shorter than 512 bits are right-padded
  * with 0 bits.
@@ -193,7 +192,8 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char 
*to,
 int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len);
 crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len);
 int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out);
-int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t 
*digests_out);
+int crypto_pk_get_common_digests(crypto_pk_t *pk,
+ common_digests_t *digests_out);
 int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space);
 int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out);
 
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 97ca8fd..d235ca5 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -237,8 +237,10 @@ tor_x509_cert_t *tor_x509_cert_decode(const uint8_t 
*certificate,
 size_t certificate_len);
 void tor_x509_cert_get_der(const tor_x509_cert_t *cert,
   const uint8_t **encoded_out, size_t *size_out);
-const common_digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t 
*cert);
-const common_digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t 
*cert);
+const common_digests_t *tor_x509_cert_get_id_digests(
+  const tor_x509_cert_t *cert);
+const common_digests_t *tor_x509_cert_get_cert_digests(
+  const tor_x509_cert_t *cert);
 int tor_tls_get_my_certs(int server,
  const tor_x509_cert_t **link_cert_out,
  const tor_x509_cert_t **id_cert_out);
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index a4c5708..016ef75 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1819,7 +1819,8 @@ channel_tls_process_certs_cell(var_cell_t *cell, 
channel_tls_t *chan)
 
 chan->conn->handshake_state->authenticated = 1;
 {
-  const common_digests_t *id_digests = 
tor_x509_cert_get_id_digests(id_cert);
+  const common_digests_t *id_digests =
+tor_x509_cert_get_id_digests(id_cert);
   crypto_pk_t *identity_rcvd;
   if (!id_digests)
 ERR("Couldn't compute digests for key in ID cert");
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index 25a2a91..df23450 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -63,9 +63,9 @@ int directory_too_idle_to_fetch_descriptors(const 
or_options_t *options,
 
 cached_dir_t *dirserv_get_consensus(const char *flavor_name);
 void dirserv_set_cached_consensus_networkstatus(const char *consensus,
-const char *flavor_name,
-const common_digests_t 
*digests,
-time_t published);
+  const char *flavor_name,
+  const common_digests_t *digests,
+  time_t published);
 void dirserv_clear_old_networkstatuses(time_t cutoff);
 int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key,
 const char **msg,
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 7323f80..2173213 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3445,7 +3445,8 @@ networkstatus_parse_vote_from_string(const char *s, const 
char **eos_out,
 
 /** Return the common_digests_t that holds the digests of the
  * flavor_name-flavored networkstatus according to the detached
- * signatures document sigs, allocating a new common_digests_t as 
neeeded. */
+ * signatures document sigs, allocating a new common_digests_t as
+ * neeeded. */
 static common_digests_t *
 detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name)
 {
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index 4745740..723d5d8 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -14,7 +14,8 @@
 
 int router_get_router_hash(const char *s, size_t s_len, char *digest);
 int router_get_dir_hash(const char *s, char *digest);
-int

[tor-commits] [tor/master] Merge branch 'bug17795'

2016-02-23 Thread nickm

commit 882e0fbd76b9b56b943680a310d16fc94ab07438
Merge: b3534df e202f3a
Author: Nick Mathewson 
Date:   Tue Feb 23 07:25:12 2016 -0500

Merge branch 'bug17795'

 src/common/crypto.c| 28 +++-
 src/common/crypto.h| 12 +++-
 src/common/tortls.c|  8 
 src/common/tortls.h| 10 ++
 src/or/channeltls.c|  5 +++--
 src/or/connection_or.c |  2 +-
 src/or/dirserv.c   |  4 ++--
 src/or/dirserv.h   |  6 +++---
 src/or/dirvote.c   |  2 +-
 src/or/networkstatus.c |  2 +-
 src/or/or.h|  4 ++--
 src/or/routerkeys.c|  4 ++--
 src/or/routerparse.c   | 25 +
 src/or/routerparse.h   |  3 ++-
 src/test/test_crypto.c |  4 ++--
 src/test/test_dir.c| 12 +++-
 src/test/test_dir_handle_get.c |  2 +-
 src/test/test_tortls.c |  6 +++---
 18 files changed, 67 insertions(+), 72 deletions(-)

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

[tor-commits] [tor/master] Restrict the meaning of digests_t to sha1+sha256.

2016-02-23 Thread nickm

commit 39b597c2fd8b45ff61573c70c36e8a4846cf3a0e
Author: Nick Mathewson 
Date:   Wed Jan 27 13:10:17 2016 -0500

Restrict the meaning of digests_t to sha1+sha256.

This saves CPU and RAM when handling consensuses and x509 certs.

Closes ticket 17795; bug not in any released tor.
---
 src/common/crypto.c | 3 ++-
 src/common/crypto.h | 6 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index a42c461..9f1ce93 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1655,7 +1655,7 @@ crypto_digest_all(digests_t *ds_out, const char *m, 
size_t len)
   memset(ds_out, 0, sizeof(*ds_out));
   if (crypto_digest(ds_out->d[DIGEST_SHA1], m, len) < 0)
 return -1;
-  for (i = DIGEST_SHA256; i < N_DIGEST_ALGORITHMS; ++i) {
+  for (i = DIGEST_SHA256; i < N_COMMON_DIGEST_ALGORITHMS; ++i) {
   switch (i) {
 case DIGEST_SHA256: /* FALLSTHROUGH */
 case DIGEST_SHA3_256:
@@ -1664,6 +1664,7 @@ crypto_digest_all(digests_t *ds_out, const char *m, 
size_t len)
   break;
 case DIGEST_SHA512:
 case DIGEST_SHA3_512: /* FALLSTHROUGH */
+  tor_assert(0); /* These won't fit. */
   if (crypto_digest512(ds_out->d[i], m, len, i) < 0)
 return -1;
   break;
diff --git a/src/common/crypto.h b/src/common/crypto.h
index fa2ed61..73b94b7 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -100,8 +100,10 @@ typedef enum {
   DIGEST_SHA3_512 = 4,
 } digest_algorithm_t;
 #define  N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1)
+#define  N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1)
 
-/** A set of all the digests we know how to compute, taken on a single
+
+/** A set of all the digests we commonly compute, taken on a single
  * string.  Any digests that are shorter than 512 bits are right-padded
  * with 0 bits.
  *
@@ -110,7 +112,7 @@ typedef enum {
  * once.
  **/
 typedef struct {
-  char d[N_DIGEST_ALGORITHMS][DIGEST512_LEN];
+  char d[N_COMMON_DIGEST_ALGORITHMS][DIGEST256_LEN];
 } digests_t;
 
 typedef struct crypto_pk_t crypto_pk_t;



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

[tor-commits] [tor/master] Rename crypto_digest_all, and digests_t.

2016-02-23 Thread nickm

commit 8a4bba06d27c99e7c1e7930761b3998a27787ce9
Author: Nick Mathewson 
Date:   Wed Feb 10 15:28:19 2016 -0500

Rename crypto_digest_all, and digests_t.

They are no longer "all" digests, but only the "common" digests.

Part of 17795.

This is an automated patch I made with a couple of perl one-liners:

  perl -i -pe 's/crypto_digest_all/crypto_common_digests/g;' src/*/*.[ch]
  perl -i -pe 's/\bdigests_t\b/common_digests_t/g;' src/*/*.[ch]
---
 src/common/crypto.c| 24 
 src/common/crypto.h|  6 +++---
 src/common/tortls.c|  6 +++---
 src/common/tortls.h|  8 
 src/or/channeltls.c|  4 ++--
 src/or/connection_or.c |  2 +-
 src/or/dirserv.c   |  4 ++--
 src/or/dirserv.h   |  2 +-
 src/or/dirvote.c   |  2 +-
 src/or/networkstatus.c |  2 +-
 src/or/or.h|  4 ++--
 src/or/routerkeys.c|  4 ++--
 src/or/routerparse.c   | 24 
 src/or/routerparse.h   |  2 +-
 src/test/test_crypto.c |  2 +-
 src/test/test_dir.c| 10 +-
 src/test/test_dir_handle_get.c |  2 +-
 src/test/test_tortls.c |  6 +++---
 18 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 9f1ce93..2ebf203 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1323,7 +1323,7 @@ crypto_pk_get_digest(const crypto_pk_t *pk, char 
*digest_out)
 /** Compute all digests of the DER encoding of pk, and store them
  * in digests_out.  Return 0 on success, -1 on failure. */
 int
-crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out)
+crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out)
 {
   unsigned char *buf = NULL;
   int len;
@@ -1331,7 +1331,7 @@ crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t 
*digests_out)
   len = i2d_RSAPublicKey(pk->key, );
   if (len < 0 || buf == NULL)
 return -1;
-  if (crypto_digest_all(digests_out, (char*)buf, len) < 0) {
+  if (crypto_common_digests(digests_out, (char*)buf, len) < 0) {
 OPENSSL_free(buf);
 return -1;
   }
@@ -1644,11 +1644,11 @@ crypto_digest512(char *digest, const char *m, size_t 
len,
 == -1);
 }
 
-/** Set the digests_t in ds_out to contain every digest on the
+/** Set the common_digests_t in ds_out to contain every digest on the
  * len bytes in m that we know how to compute.  Return 0 on
  * success, -1 on failure. */
 int
-crypto_digest_all(digests_t *ds_out, const char *m, size_t len)
+crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len)
 {
   int i;
   tor_assert(ds_out);
@@ -1757,7 +1757,7 @@ struct crypto_digest_t {
  * when we free one.
  */
 static size_t
-crypto_digest_alloc_bytes(digest_algorithm_t alg)
+crypto_common_digestsoc_bytes(digest_algorithm_t alg)
 {
   /* Helper: returns the number of bytes in the 'f' field of 'st' */
 #define STRUCT_FIELD_SIZE(st, f) (sizeof( ((st*)0)->f ))
@@ -1788,7 +1788,7 @@ crypto_digest_t *
 crypto_digest_new(void)
 {
   crypto_digest_t *r;
-  r = tor_malloc(crypto_digest_alloc_bytes(DIGEST_SHA1));
+  r = tor_malloc(crypto_common_digestsoc_bytes(DIGEST_SHA1));
   SHA1_Init(>d.sha1);
   r->algorithm = DIGEST_SHA1;
   return r;
@@ -1801,7 +1801,7 @@ crypto_digest256_new(digest_algorithm_t algorithm)
 {
   crypto_digest_t *r;
   tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256);
-  r = tor_malloc(crypto_digest_alloc_bytes(algorithm));
+  r = tor_malloc(crypto_common_digestsoc_bytes(algorithm));
   if (algorithm == DIGEST_SHA256)
 SHA256_Init(>d.sha2);
   else
@@ -1817,7 +1817,7 @@ crypto_digest512_new(digest_algorithm_t algorithm)
 {
   crypto_digest_t *r;
   tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512);
-  r = tor_malloc(crypto_digest_alloc_bytes(algorithm));
+  r = tor_malloc(crypto_common_digestsoc_bytes(algorithm));
   if (algorithm == DIGEST_SHA512)
 SHA512_Init(>d.sha512);
   else
@@ -1833,7 +1833,7 @@ crypto_digest_free(crypto_digest_t *digest)
 {
   if (!digest)
 return;
-  size_t bytes = crypto_digest_alloc_bytes(digest->algorithm);
+  size_t bytes = crypto_common_digestsoc_bytes(digest->algorithm);
   memwipe(digest, 0, bytes);
   tor_free(digest);
 }
@@ -1893,7 +1893,7 @@ crypto_digest_get_digest(crypto_digest_t *digest,
 return;
   }
 
-  const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm);
+  const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm);
   /* memcpy into a temporary ctx, since SHA*_Final clears the context */
   memcpy(, digest, alloc_bytes);
   switch (digest->algorithm) {
@@ -1925,7 +1925,7 @@ crypto_digest_t *
 crypto_digest_dup(const crypto_digest_t *digest)
 {
   tor_assert(digest);
-  const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm);
+  const size_t alloc_bytes =

[tor-commits] [tor/master] Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378

2016-02-23 Thread nickm

commit b3534dfc5e85c82e915c1576a8a58500fdd7c878
Author: Nick Mathewson 
Date:   Tue Feb 23 07:16:51 2016 -0500

Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378
---
 src/test/test_address.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/test_address.c b/src/test/test_address.c
index 3b17b23..748dfc5 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -297,7 +297,9 @@ test_address_get_if_addrs_ifaddrs(void *arg)
   }
 
   done:
-  SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t));
+  if (results) {
+SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t));
+  }
   smartlist_free(results);
   return;
 }

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

[tor-commits] [tor/master] Fix an erroneous renaming

2016-02-23 Thread nickm

commit e202f3a1ca2d2ef87820d0ff618a37d76b4e702a
Author: Nick Mathewson 
Date:   Tue Feb 23 07:22:53 2016 -0500

Fix an erroneous renaming

Did you know that crypto_digest_all is a substring of
crypto_digest_alloc_bytes()?  Hence the mysterious emergence of
"crypto_common_digestsoc_bytes".

Next time I should use the \b assertion in my regexen.

Spotted by Mike.
---
 src/common/crypto.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 6c40c6e..9e66ded 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1742,7 +1742,7 @@ struct crypto_digest_t {
  * when we free one.
  */
 static size_t
-crypto_common_digestsoc_bytes(digest_algorithm_t alg)
+crypto_digest_alloc_bytes(digest_algorithm_t alg)
 {
   /* Helper: returns the number of bytes in the 'f' field of 'st' */
 #define STRUCT_FIELD_SIZE(st, f) (sizeof( ((st*)0)->f ))
@@ -1773,7 +1773,7 @@ crypto_digest_t *
 crypto_digest_new(void)
 {
   crypto_digest_t *r;
-  r = tor_malloc(crypto_common_digestsoc_bytes(DIGEST_SHA1));
+  r = tor_malloc(crypto_digest_alloc_bytes(DIGEST_SHA1));
   SHA1_Init(>d.sha1);
   r->algorithm = DIGEST_SHA1;
   return r;
@@ -1786,7 +1786,7 @@ crypto_digest256_new(digest_algorithm_t algorithm)
 {
   crypto_digest_t *r;
   tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256);
-  r = tor_malloc(crypto_common_digestsoc_bytes(algorithm));
+  r = tor_malloc(crypto_digest_alloc_bytes(algorithm));
   if (algorithm == DIGEST_SHA256)
 SHA256_Init(>d.sha2);
   else
@@ -1802,7 +1802,7 @@ crypto_digest512_new(digest_algorithm_t algorithm)
 {
   crypto_digest_t *r;
   tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512);
-  r = tor_malloc(crypto_common_digestsoc_bytes(algorithm));
+  r = tor_malloc(crypto_digest_alloc_bytes(algorithm));
   if (algorithm == DIGEST_SHA512)
 SHA512_Init(>d.sha512);
   else
@@ -1818,7 +1818,7 @@ crypto_digest_free(crypto_digest_t *digest)
 {
   if (!digest)
 return;
-  size_t bytes = crypto_common_digestsoc_bytes(digest->algorithm);
+  size_t bytes = crypto_digest_alloc_bytes(digest->algorithm);
   memwipe(digest, 0, bytes);
   tor_free(digest);
 }
@@ -1878,7 +1878,7 @@ crypto_digest_get_digest(crypto_digest_t *digest,
 return;
   }
 
-  const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm);
+  const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm);
   /* memcpy into a temporary ctx, since SHA*_Final clears the context */
   memcpy(, digest, alloc_bytes);
   switch (digest->algorithm) {
@@ -1910,7 +1910,7 @@ crypto_digest_t *
 crypto_digest_dup(const crypto_digest_t *digest)
 {
   tor_assert(digest);
-  const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm);
+  const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm);
   return tor_memdup(digest, alloc_bytes);
 }
 
@@ -1925,7 +1925,7 @@ crypto_digest_assign(crypto_digest_t *into,
   tor_assert(into);
   tor_assert(from);
   tor_assert(into->algorithm == from->algorithm);
-  const size_t alloc_bytes = crypto_common_digestsoc_bytes(from->algorithm);
+  const size_t alloc_bytes = crypto_digest_alloc_bytes(from->algorithm);
   memcpy(into,from,alloc_bytes);
 }
 



___
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

2016-02-23 Thread translation

commit 9e5a0f1aca6696f0c3ef2165f05df7d1b062dd73
Author: Translation commit bot 
Date:   Tue Feb 23 12:15:46 2016 +

Update translations for tails-misc
---
 fr_CA.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fr_CA.po b/fr_CA.po
index a3625f7..22e52df 100644
--- a/fr_CA.po
+++ b/fr_CA.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 18:13+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 12:12+\n"
 "Last-Translator: Trans-fr\n"
 "Language-Team: French (Canada) 
(http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -389,19 +389,19 @@ msgstr "Le systÃ¨me d'exploitation hÃ´te et le logiciel 
de virtualisation peuven
 msgid "Learn more"
 msgstr "En apprendre davantage"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor n'est pas prÃªt"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor n'est pas prÃªt. DÃ©marrer le navigateur Tor quand mÃªme?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "DÃ©marrer le navigateur Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Annuler"
 

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

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

2016-02-23 Thread translation

commit be1508dc0ae86a50c7b57ee969f89ea6a0ffdb7f
Author: Translation commit bot 
Date:   Tue Feb 23 12:15:50 2016 +

Update translations for tails-misc_completed
---
 fr_CA.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fr_CA.po b/fr_CA.po
index a3625f7..22e52df 100644
--- a/fr_CA.po
+++ b/fr_CA.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 18:13+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 12:12+\n"
 "Last-Translator: Trans-fr\n"
 "Language-Team: French (Canada) 
(http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -389,19 +389,19 @@ msgstr "Le systÃ¨me d'exploitation hÃ´te et le logiciel 
de virtualisation peuven
 msgid "Learn more"
 msgstr "En apprendre davantage"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor n'est pas prÃªt"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor n'est pas prÃªt. DÃ©marrer le navigateur Tor quand mÃªme?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "DÃ©marrer le navigateur Tor"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Annuler"
 

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

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

2016-02-23 Thread translation

commit 90d13fc19e6e8c9780a6717ab40ca622b362cb6f
Author: Translation commit bot 
Date:   Tue Feb 23 12:15:16 2016 +

Update translations for https_everywhere
---
 fr_CA/https-everywhere.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd
index 3693a85..dd12b16 100644
--- a/fr_CA/https-everywhere.dtd
+++ b/fr_CA/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
+
+
 
 

___
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

2016-02-23 Thread translation

commit e02c5e79c8d04544aa2a7cefd43d7efecb4fca59
Author: Translation commit bot 
Date:   Tue Feb 23 11:45:47 2016 +

Update translations for tails-misc
---
 nb.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nb.po b/nb.po
index 905a028..0f63685 100644
--- a/nb.po
+++ b/nb.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 22:45+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 11:22+\n"
 "Last-Translator: Allan NordhÃ¸y \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -393,19 +393,19 @@ msgstr "BÃ¥de vertssystemet og 
virtualiseringsprogramvaren er i stand til Ã¥ ove
 msgid "Learn more"
 msgstr "LÃ¦r mer"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor er ikke klar"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor er ikke klar. Starte Tor Browser uansett?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Start Tor Browser"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Avbryt"
 

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

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

2016-02-23 Thread translation

commit f30f8e14b95a83282b16a983c006cefe3281e60e
Author: Translation commit bot 
Date:   Tue Feb 23 11:45:15 2016 +

Update translations for https_everywhere
---
 nb/https-everywhere.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index 279fbe7..caa6082 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -42,15 +42,15 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
-
-
+
+
 
 

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

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

2016-02-23 Thread translation

commit 58e790b9f409efe3a31b39673549acf2a8411322
Author: Translation commit bot 
Date:   Tue Feb 23 09:45:21 2016 +

Update translations for https_everywhere_completed
---
 tr/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index 7a1dbbc..126b7f1 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

___
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

2016-02-23 Thread translation

commit 198ffc5dc31ecd6a030041ac43b58baf4f43f7cf
Author: Translation commit bot 
Date:   Tue Feb 23 09:45:48 2016 +

Update translations for tails-misc
---
 tr.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tr.po b/tr.po
index fd514cf..7d7d9cb 100644
--- a/tr.po
+++ b/tr.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 09:47+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 09:17+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -400,19 +400,19 @@ msgstr "Sunucu iÅletim sistemi ve sanallaÅtÄ±rma 
yazÄ±lÄ±mÄ± Tails Ã¼zerinde n
 msgid "Learn more"
 msgstr "Daha fazla bilgi"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor hazÄ±r deÄil"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor hazÄ±r deÄil. Gene de Tor Browser baÅlatÄ±lsÄ±n mÄ±?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Tor Browser BaÅlatÄ±lsÄ±n"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Ä°ptal"
 

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

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

2016-02-23 Thread translation

commit 3b4effb7aba6132a5b52f376e025efdf7d5bf31c
Author: Translation commit bot 
Date:   Tue Feb 23 09:45:52 2016 +

Update translations for tails-misc_completed
---
 tr.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tr.po b/tr.po
index fd514cf..7d7d9cb 100644
--- a/tr.po
+++ b/tr.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:00+0100\n"
-"PO-Revision-Date: 2016-01-12 09:47+\n"
+"POT-Creation-Date: 2016-02-12 13:52+0100\n"
+"PO-Revision-Date: 2016-02-23 09:17+\n"
 "Last-Translator: Volkan Gezer \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -400,19 +400,19 @@ msgstr "Sunucu iÅletim sistemi ve sanallaÅtÄ±rma 
yazÄ±lÄ±mÄ± Tails Ã¼zerinde n
 msgid "Learn more"
 msgstr "Daha fazla bilgi"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:29
+#: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready"
 msgstr "Tor hazÄ±r deÄil"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:30
+#: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Tor is not ready. Start Tor Browser anyway?"
 msgstr "Tor hazÄ±r deÄil. Gene de Tor Browser baÅlatÄ±lsÄ±n mÄ±?"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:31
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Start Tor Browser"
 msgstr "Tor Browser BaÅlatÄ±lsÄ±n"
 
-#: config/chroot_local-includes/usr/local/bin/tor-browser:32
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
 msgid "Cancel"
 msgstr "Ä°ptal"
 

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

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

2016-02-23 Thread translation

commit e22e5683c4a87d415b736588010bf00f3dc0268e
Author: Translation commit bot 
Date:   Tue Feb 23 09:45:15 2016 +

Update translations for https_everywhere
---
 tr/https-everywhere.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd
index 0b359b6..126b7f1 100644
--- a/tr/https-everywhere.dtd
+++ b/tr/https-everywhere.dtd
@@ -43,14 +43,14 @@
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 

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

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

2016-02-23 Thread translation

commit 44abd4a5aed3a377efe863e80f0fdbc1066522ce
Author: Translation commit bot 
Date:   Tue Feb 23 09:16:38 2016 +

Update translations for https_everywhere_completed
---
 templates/https-everywhere.dtd | 13 +
 1 file changed, 13 insertions(+)

diff --git a/templates/https-everywhere.dtd b/templates/https-everywhere.dtd
index e5692a6..2ac51cd 100644
--- a/templates/https-everywhere.dtd
+++ b/templates/https-everywhere.dtd
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 
@@ -41,3 +42,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+

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

97 matches

Mail list logo