April 2015 - tor-commits - lists.torproject.org

[stem/master] Simplifying twitter example
by atagar＠torproject.org 21 Apr '15

21 Apr '15

commit d293eb8b52a1bf23e9ac1767cc7fdc0c54a12520 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 20 21:01:03 2015 -0700 Simplifying twitter example Replacing the KEY_DICT global and helpers with a shorter script. I don't have a Twitter account so unfortunately can't exercise this sucker, but should be equivalent to what we had previously. This and the prior commit are for... https://trac.torproject.org/projects/tor/ticket/9003 --- docs/tutorials/to_russia_with_love.rst | 87 +++++++++++++------------------- 1 file changed, 36 insertions(+), 51 deletions(-) diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index 7d91f4b..6bb4252 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -121,93 +121,78 @@ Besides SocksiPy, you can also use `PycURL <http://pycurl.sourceforge.net/>`_ to Reading Twitter --------------- -Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be easily done `using thier API <https://dev.twitter.com/rest/reference/get/statuses/user_timeline>`_ +Now lets do somthing a little more interesting, and read a Twitter feed over Tor. This can be done `using thier API <https://dev.twitter.com/rest/reference/get/statuses/user_timeline>`_, for authentication `see their instructions <https://dev.twitter.com/oauth/overview/application-owner-access-tokens>`_... :: + import binascii + import hashlib + import hmac import json import socket + import time import urllib import urllib2 - import time - import binascii - import hmac - from hashlib import sha1, md5 import socks # SockiPy module import stem.process SOCKS_PORT = 7000 - KEY_DICT = dict() TWITTER_API_URL = "https://api.twitter.com/1.1/statuses/user_timeline.json" CONSUMER_KEY = "" CONSUMER_SECRET = "" ACCESS_TOKEN = "" ACCESS_TOKEN_SECRET = "" - HTTP_METHOD = "GET" - OAUTH_VERSION = "1.0" + + HEADER_AUTH_KEYS = ['oauth_consumer_key', 'oauth_nonce', 'oauth_signature', + 'oauth_signature_method', 'oauth_timestamp', 'oauth_token', 'oauth_version'] socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, '127.0.0.1', SOCKS_PORT) socket.socket = socks.socksocket + def oauth_signature(key_dict): + fin_key = "" - def init_key_dict(): - """ - Initializes KEY_DICT - """ - - global KEY_DICT - KEY_DICT['oauth_consumer_key'] = urllib.quote(CONSUMER_KEY, '') - KEY_DICT['oauth_nonce'] = urllib.quote(md5(str(time.time())).hexdigest(), '') - KEY_DICT['oauth_signature_method'] = urllib.quote("HMAC-SHA1", '') - KEY_DICT['oauth_timestamp'] = urllib.quote(str(int(time.time())), '') - KEY_DICT['oauth_token'] = urllib.quote(ACCESS_TOKEN, '') - KEY_DICT['oauth_version'] = urllib.quote(OAUTH_VERSION, '') + for key in sorted(key_dict.keys()): + fin_key += key + "=" + key_dict[key] + "&" - def get_signature(values): - """ - Generates KEY_DICT['oauth_signature'] - """ - for value in values: - KEY_DICT[value] = urllib.quote(values[value], '') - fin_key = "" - for key in sorted(KEY_DICT.keys()): - fin_key += key + "=" + KEY_DICT[key] + "&" fin_key = fin_key[:-1] - fin_key = HTTP_METHOD + "&" + urllib.quote(TWITTER_API_URL, '') + "&" + urllib.quote(fin_key, '') + fin_key = 'GET' + "&" + urllib.quote(TWITTER_API_URL, '') + "&" + urllib.quote(fin_key, '') key = urllib.quote(CONSUMER_SECRET, '') + "&" + urllib.quote(ACCESS_TOKEN_SECRET, '') - hashed = hmac.new(key, fin_key, sha1) + hashed = hmac.new(key, fin_key, hashlib.sha1) fin_key = binascii.b2a_base64(hashed.digest())[:-1] - KEY_DICT['oauth_signature'] = urllib.quote(fin_key, '') - - def get_header_string(): - """ - Returns the header string - """ - ret = "OAuth " - key_list =['oauth_consumer_key', 'oauth_nonce', 'oauth_signature', 'oauth_signature_method', 'oauth_timestamp', 'oauth_token', 'oauth_version'] - for key in key_list: - ret = ret + key + "=\"" + KEY_DICT[key] + "\", " - ret = ret[:-2] - return ret + return urllib.quote(fin_key, '') def poll_twitter_feed(user_id, tweet_count): """ Polls Twitter for the tweets from a given user. """ - init_key_dict() - values = {'screen_name': user_id, 'count': str(tweet_count), 'include_rts': '1'} - api_url = TWITTER_API_URL - get_signature(values) - headers = {'Authorization': get_header_string()} - data = urllib.urlencode(values) - api_request = urllib2.Request(api_url + "?" + data, headers= headers) + key_dict = { + 'oauth_consumer_key': urllib.quote(CONSUMER_KEY, ''), + 'oauth_nonce': urllib.quote(hashlib.md5(str(time.time())).hexdigest(), ''), + 'oauth_signature_method': urllib.quote("HMAC-SHA1", ''), + 'oauth_timestamp': urllib.quote(str(int(time.time())), ''), + 'oauth_token': urllib.quote(ACCESS_TOKEN, ''), + 'oauth_version': urllib.quote('1.0', ''), + } + + url_values = {'screen_name': user_id, 'count': str(tweet_count), 'include_rts': '1'} + + for key, value in url_values.items(): + key_dict[key] = urllib.quote(value, '') + + key_dict['oauth_signature'] = oauth_signature(key_dict) + + header_auth = 'OAuth ' + ', '.join(['%s="%s"' % (key, key_dict[key]) for key in HEADER_AUTH_KEYS]) + + data = urllib.urlencode(url_values) + api_request = urllib2.Request(TWITTER_API_URL + "?" + data, headers = {'Authorization': header_auth}) try: api_response = urllib2.urlopen(api_request).read() except: - raise IOError("Unable to reach %s" % api_url) + raise IOError("Unable to reach %s" % TWITTER_API_URL) return json.loads(api_response)

1 0

[stem/master] Only run installation test once
by atagar＠torproject.org 20 Apr '15

20 Apr '15

commit 2f44df7aa01ffd2aa2d68e3e07966e6785e4f1d1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 20 19:54:59 2015 -0700 Only run installation test once This test is unimpacted by targets and can take a sec, so no reason to run it multiple times. --- test/integ/installation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 618cd4e..f0ce9ed 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -10,11 +10,12 @@ import test.runner class TestInstallation(unittest.TestCase): + @test.runner.only_run_once def test_installing_stem(self): base_directory = os.path.sep.join(__file__.split(os.path.sep)[:-3]) if not os.path.exists(os.path.sep.join([base_directory, 'setup.py'])): - test.runner.skip(self, "(only for git checkout)") + test.runner.skip(self, '(only for git checkout)') original_cwd = os.getcwd() @@ -24,7 +25,7 @@ class TestInstallation(unittest.TestCase): site_packages_paths = glob.glob('/tmp/stem_test/lib/*/site-packages') if len(site_packages_paths) != 1: - self.fail("We should only have a single site-packages directory, but instead had: %s" % site_packages_paths) + self.fail('We should only have a single site-packages directory, but instead had: %s' % site_packages_paths) self.assertEqual(stem.__version__, stem.util.system.call(['python', '-c', "import sys;sys.path.insert(0, '%s');import stem;print stem.__version__" % site_packages_paths[0]])[0]) finally:

1 0

[stem/master] Test for 'python setup.py install'
by atagar＠torproject.org 20 Apr '15

20 Apr '15

commit a6ea923c7a6dfb6c20620955382a4b6d469ab31f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 20 19:09:30 2015 -0700 Test for 'python setup.py install' This has been a hole in our tests for quite some time, biting us from time to time during releas time... https://trac.torproject.org/projects/tor/ticket/15258 Just a simple test for now. Might expand this in the future with more assertions. --- stem/util/system.py | 11 ++++++++--- test/integ/installation.py | 32 ++++++++++++++++++++++++++++++++ test/settings.cfg | 1 + 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index c263ce3..aa13cb9 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -957,7 +957,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False): results. This is not actually ran in a shell so pipes and other shell syntax are not permitted. - :param str command: command to be issued + :param str,list command: command to be issued :param object default: response if the query fails :param bool ignore_exit_status: reports failure if our command's exit status was non-zero @@ -967,11 +967,16 @@ def call(command, default = UNDEFINED, ignore_exit_status = False): :raises: **OSError** if this fails and no default was provided """ + if isinstance(command, str): + command_list = command.split(' ') + else: + command_list = command + try: - is_shell_command = command.split(' ')[0] in SHELL_COMMANDS + is_shell_command = command_list[0] in SHELL_COMMANDS start_time = time.time() - process = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command) + process = subprocess.Popen(command_list, stdout = subprocess.PIPE, stderr = subprocess.PIPE, shell = is_shell_command) stdout, stderr = process.communicate() stdout, stderr = stdout.strip(), stderr.strip() diff --git a/test/integ/installation.py b/test/integ/installation.py new file mode 100644 index 0000000..618cd4e --- /dev/null +++ b/test/integ/installation.py @@ -0,0 +1,32 @@ +import glob +import os +import shutil +import unittest + +import stem +import stem.util.system + +import test.runner + + +class TestInstallation(unittest.TestCase): + def test_installing_stem(self): + base_directory = os.path.sep.join(__file__.split(os.path.sep)[:-3]) + + if not os.path.exists(os.path.sep.join([base_directory, 'setup.py'])): + test.runner.skip(self, "(only for git checkout)") + + original_cwd = os.getcwd() + + try: + os.chdir(base_directory) + stem.util.system.call('python setup.py install --prefix /tmp/stem_test') + site_packages_paths = glob.glob('/tmp/stem_test/lib/*/site-packages') + + if len(site_packages_paths) != 1: + self.fail("We should only have a single site-packages directory, but instead had: %s" % site_packages_paths) + + self.assertEqual(stem.__version__, stem.util.system.call(['python', '-c', "import sys;sys.path.insert(0, '%s');import stem;print stem.__version__" % site_packages_paths[0]])[0]) + finally: + shutil.rmtree('/tmp/stem_test') + os.chdir(original_cwd) diff --git a/test/settings.cfg b/test/settings.cfg index 21f5eb2..79fec01 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -201,6 +201,7 @@ test.integ_tests |test.integ.util.connection.TestConnection |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem +|test.integ.installation.TestInstallation |test.integ.descriptor.remote.TestDescriptorDownloader |test.integ.descriptor.server_descriptor.TestServerDescriptor |test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor

1 0

[tor-browser-bundle/master] Add changelog draft for 4.5.
by mikeperry＠torproject.org 20 Apr '15

20 Apr '15

commit a73cdf8b099adcae40aea2c7426fc6b248fcd3ec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 20 18:05:31 2015 -0700 Add changelog draft for 4.5. Warning: This contains things in the tbb-4.5-alpha tag that we haven't merged yet, as well as component version updates we haven't done yet. --- Bundle-Data/Docs/ChangeLog.txt | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 056caf3..70fe201 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,35 @@ +Tor Browser 4.5 -- Apr 28 2015 + * All Platforms + * Update Tor to 0.2.6.7 with additional patches: + * Bug 15482: Reset timestamp_dirty each time a SOCKSAuth circuit is used + * Update NoScript to 2.6.9.22 + * Update HTTPS-Everywhere to 5.0.2 + * Bug 15689: Resume building HTTPS-Everywhere from git tags + * Update meek to 0.17 + * Update obfs4proxy to 0.0.5 + * Update Tor Launcher to 0.2.7.4 + * Bug 15704: Do not enable network if wizard is opened + * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked + * Bug 13576: Don't strip "bridge" from the middle of bridge lines + * Bug 15657: Display the host:port of any connection faiures in bootstrap + * Update Torbutton to 1.9.2.0 + * Bug 15562: Bind SharedWorkers to thirdparty pref + * Bug 15533: Restore default security level when restoring defaults + * Bug 15510: Close Tor Circuit UI control port connections on New Identity + * Bug 15472: Make node text black in circuit status UI + * Bug 15502: Wipe blob URIs on New Identity + * Bug 4100: Raise HTTP Keep-Alive back to 115 second default + * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting + * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism + * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bug 15562: Disable Javascript SharedWorkers due to third party tracking + * Linux + * Bug 15747: Improve start-tor-browser argument handling + * Bug 15672: Provide desktop app registration+unregistration for Linux + * Windows + * Bug 15539: Make installer exe signatures reproducibly removable + * Bug 10761: Fix instances of shutdown crashes + Tor Browser 4.5a5 -- Mar 31 2015 * All Platforms * Update Firefox to 31.6.0esr

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 14716: HTTP Basic Authentication prompt only displayed once
by mikeperry＠torproject.org 20 Apr '15

20 Apr '15

commit f0fe46bcec5946e94fd66792983b1f081913a74f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 17 16:31:28 2015 -0400 Bug 14716: HTTP Basic Authentication prompt only displayed once Modify the login manager implementation to handle the situation where storage is not available. --- toolkit/components/passwordmgr/nsLoginManager.js | 57 +++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index a4cbdb0..19024fd 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -243,6 +243,10 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; + if (!this._storage) { + throw "No storage to add login"; + } + log("Adding login"); return this._storage.addLogin(login); }, @@ -255,6 +259,12 @@ LoginManager.prototype = { */ removeLogin : function (login) { log("Removing login"); + + if (!this._storage) { + log("No storage to remove login"); + return null; + } + return this._storage.removeLogin(login); }, @@ -266,6 +276,12 @@ LoginManager.prototype = { */ modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); + + if (!this._storage) { + log("No storage to modify login"); + return null; + } + return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -281,6 +297,12 @@ LoginManager.prototype = { */ getAllLogins : function (count) { log("Getting a list of all logins"); + + if (!this._storage) { + log("No storage to get all logins"); + return null; + } + return this._storage.getAllLogins(count); }, @@ -292,7 +314,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -307,6 +332,12 @@ LoginManager.prototype = { */ getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); + + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } + return this._storage.getAllDisabledHosts(count); }, @@ -320,6 +351,11 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); + if (!this._storage) { + log("No storage to find logins"); + return null; + } + return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); }, @@ -336,6 +372,11 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); + if (!this._storage) { + log("No storage to search logins"); + return null; + } + return this._storage.searchLogins(count, matchData); }, @@ -350,6 +391,9 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); + if (!this._storage) + return 0; + return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -358,6 +402,9 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { + if (!this._storage) + return false; + return this._storage.uiBusy; }, @@ -366,6 +413,9 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { + if (!this._storage) + return false; + return this._storage.isLoggedIn; }, @@ -377,7 +427,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -394,6 +444,9 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; + if (!this._storage) + throw "No storage to set login saving enabled"; + log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled); },

1 0

[torbutton/master] Add changelog and bump version for 1.9.2.0.
by mikeperry＠torproject.org 20 Apr '15

20 Apr '15

commit 60b1537295374c64594564a00d17bcc42dc76985 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 20 17:26:45 2015 -0700 Add changelog and bump version for 1.9.2.0. --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e140ff5..e50f5b6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.2.0: + * Bug 15562: Bind SharedWorkers to thirdparty pref + * Bug 15533: Restore default security level when restoring defaults + * Bug 15510: Close Tor Circuit UI control port connections on New Identity + * Bug 15472: Make node text black in circuit status UI. + * Bug 15502: Wipe blob URIs on New Identity + 1.9.1.0: * Bug 9387: "Security Slider 1.0" * Include descriptions and tooltip hints for security levels diff --git a/src/install.rdf b/src/install.rdf index 94245a0..6af4e9b 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.1.0</em:version> + <em:version>1.9.2.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug #15502: Wipe blob URIs on New Identity
by mikeperry＠torproject.org 20 Apr '15

20 Apr '15

commit 2568365dfa0ce8ebc2f5f430b4c752ca57b2fc97 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 13 10:41:44 2015 -0700 Bug #15502: Wipe blob URIs on New Identity --- src/chrome/content/torbutton.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b4b3ab5..2fdfd1c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1884,6 +1884,12 @@ function torbutton_do_new_identity() { torbutton_log(3, "New identity successful"); + // Run garbage collection and cycle collection after window is gone. + // This ensures that blob URIs are forgotten. + window.addEventListener("unload", function (event) { + m_tb_domWindowUtils.garbageCollect(); + }); + // Close the current window for added safety window.close(); }

1 0

[torbutton/master] Bug #15502: Ensure garbage collection runs immediately and completely.
by mikeperry＠torproject.org 20 Apr '15

20 Apr '15

commit accb4b887b4427221358fc8c17bbbdf85e77467c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 21:34:07 2015 -0700 Bug #15502: Ensure garbage collection runs immediately and completely. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2fdfd1c..7d229dd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1887,7 +1887,34 @@ function torbutton_do_new_identity() { // Run garbage collection and cycle collection after window is gone. // This ensures that blob URIs are forgotten. window.addEventListener("unload", function (event) { + torbutton_log(3, "Initiating New Identity GC pass"); + // Clear out potential pending sInterSliceGCTimer: + m_tb_domWindowUtils.runNextCollectorTimer(); + + // Clear out potential pending sICCTimer: + m_tb_domWindowUtils.runNextCollectorTimer(); + + // Schedule a garbage collection in 4000-1000ms... + m_tb_domWindowUtils.garbageCollect(); + + // To ensure the GC runs immediately instead of 4-10s from now, we need + // to poke it at least 11 times. + // We need 5 pokes for GC, 1 poke for the interSliceGC, and 5 pokes for CC. + // See nsJSContext::RunNextCollectorTimer() in + // https://mxr.mozilla.org/mozilla-central/source/dom/base/nsJSEnvironment.cpp…. + // XXX: We might want to make our own method for immediate full GC... + for (let poke = 0; poke < 11; poke++) { + m_tb_domWindowUtils.runNextCollectorTimer(); + } + + // And now, since the GC probably actually ran *after* the CC last time, + // run the whole thing again. m_tb_domWindowUtils.garbageCollect(); + for (let poke = 0; poke < 11; poke++) { + m_tb_domWindowUtils.runNextCollectorTimer(); + } + + torbutton_log(3, "Completed New Identity GC pass"); }); // Close the current window for added safety

1 0

[metrics-tasks/master] Add another introduction-point graph (#15513).
by karsten＠torproject.org 20 Apr '15

20 Apr '15

commit f8d2801f34b79b21a51a5ace7fb46ec08874fbcf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 20 22:22:00 2015 +0200 Add another introduction-point graph (#15513). --- task-15513/plot.R | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/task-15513/plot.R b/task-15513/plot.R index f1ce9d3..26fc854 100644 --- a/task-15513/plot.R +++ b/task-15513/plot.R @@ -79,3 +79,16 @@ ggplot(data) + ggtitle(paste("Number of introduction points established on\nthe same", "relay (in the measurement period)\n")) +l <- read.csv("intros-per-desc.csv") +l <- aggregate(list(introsperdesc = l$introsperdesc), by = list( + publication = (l$publication %/% (1 * 3600 * 1000)) * (1 * 3600), + service = l$service), FUN = max) +ggplot(l, aes(x = as.POSIXct(publication, + origin = "1970-01-01 00:00:00"), y = introsperdesc, fill = service)) + + geom_area() + + scale_fill_hue("", guide = "none") + + facet_grid(service ~ .) + + scale_x_datetime("") + + scale_y_continuous("") + + ggtitle("Number of introduction points over time\n") +

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 20 Apr '15

20 Apr '15

commit 07f1b5766a4fb1b338d3fe12cf7e546dd64120df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 18:15:08 2015 +0000 Update translations for bridgedb_completed --- ca/LC_MESSAGES/bridgedb.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 2b9376b..36f8c24 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-20 17:44+0000\n" +"PO-Revision-Date: 2015-04-20 18:02+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "A més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet, en molts casos.\n" +msgstr "A més a més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -135,11 +135,11 @@ msgstr "Què són els ponts?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Ponts %s són mecanismes Tor que ajuden a esquivar la censura." +msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Necessito una manera alternativa d'obtenir ponts" +msgstr "Em cal una manera alternativa d'obtenir ponts." #: lib/bridgedb/strings.py:83 #, python-format @@ -157,7 +157,7 @@ msgstr "No em funcionen els ponts! Ajuda!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si el teu Tor no funciona, hauries d'enviar un correu a %s." +msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -175,32 +175,32 @@ msgstr "Les vostres línies de ponts:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Descarrega ponts!" +msgstr "Descarregueu ponts!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Si us plau, sel·leccioni les opcions pel tipus de pont:" +msgstr "Seleccioneu les opcions pel tipus de pont:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Necessites adreces IPv6?" +msgstr "Necessiteu adreces IPv6?" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "Necessites un %s?" +msgstr "Necessiteu un %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "El seu navegador no està mostrant les imatges correctament." +msgstr "El navegador no està mostrant les imatges correctament." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "Introdueixi els caràcters de la imatge superior..." +msgstr "Introduïu els caràcters de la imatge superior..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "Per començar a utilitzar els ponts" +msgstr "Com començar a utilitzar els ponts" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -209,7 +209,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Per introduir ponts al Navegador Tor, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Navegador Tor. " +msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Tor Browser. " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 @@ -232,7 +232,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els vostres ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." +msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." #: lib/bridgedb/strings.py:142 msgid "Displays this message."

1 0