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

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit ec0a3756bb5499cc011e3f390cde64b069eddb5d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 16:45:45 2015 +0000 Update translations for torbutton-torbuttonproperties --- lo/torbutton.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lo/torbutton.properties b/lo/torbutton.properties index 70d5a4a..43e42c8 100644 --- a/lo/torbutton.properties +++ b/lo/torbutton.properties @@ -2,11 +2,11 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor torbutton.circuit_display.internet = ອິນເຕີເນັດ torbutton.circuit_display.ip_unknown = ບໍ່ຮູ້ຈັກ IP ນີ້ -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.onion_site = ເວັບໄຊຕ໌ Onion +torbutton.circuit_display.this_browser = ຕົວທ່ອງເວັບນີ້ +torbutton.circuit_display.relay = ຜັດປ່ຽນ torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.unknown_country = ບໍ່ຮູ້ ປະເທດ torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.plugins.disabled = Click to enable plugins @@ -53,7 +53,7 @@ torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n torbutton.popup.never_ask_again = Never ask me again -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = ຕົວທ່ອງເວັບ Tor ຈະອັດທຸກໜ້າຕ່າງ ແລະ ແຖບ. ທຸກ ເວັບໄຊຕ໌ ທີ່ເຊື່ອມຕໍ່ຢູ່ ຈະຖືກເສຍ\n\nເລີ່ມແລ່ນ ຕົວທ່ອງເວັບ Tor ຄືນໃໝ່ດຽວນີ້ ເພື່ອຕັ້ງຄ່າເອກະລັກທ່ານຄືນໃໝ່ ບໍ່?\n torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings @@ -69,7 +69,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileProblemTitle=ລາຍລະອຽດບັນຫາ %S +profileReadOnly=ທ່ານບໍ່ສາມາດແລ່ນ %S ຈາກລະບົບຟາຍລ໌ອ່ານໄດ້ຢ່າງດຽວ. ກະລຸນາ ກ່າຍເອົາ %S ໄປໃສ່ບ່ອນອື່ນກ່ອນ ກ່ອນຈະພະຍາຍາມໃຊ້ມັນ. +profileReadOnlyMac=ທ່ານບໍ່ສາມາດແລ່ນ %S ຈາກລະບົບຟາຍລ໌ອ່ານໄດ້ຢ່າງດຽວ. ກະລຸນາ ກ່າຍເອົາ %S ໄປໃສ່ ໜ້າຈໍຂອງທ່ານກ່ອນ ຫຼື ໃສ່ຕູ້ແອັບພຼີເຄຊັນ ກ່ອນຈະພະຍາຍາມໃຊ້ມັນ. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.

1 0

[stem/master] tail() function for reading the last lines from a file
by atagar＠torproject.org 24 Mar '15

24 Mar '15

commit 8736a7ee133a8eecc7f193b52f23c3ed951271ee Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 24 09:26:41 2015 -0700 tail() function for reading the last lines from a file Tor log files can be in the order of gigabytes so we often want a tail helper for reading them. Happily StackOverflow had some great answers... https://stackoverflow.com/questions/136168/get-last-n-lines-of-a-file-with-… Adopting a slight tweak of S.Lott's answer with papercrane's fix. Actually, this performs even better than shelling out to tail. Tad surprised. :P % cat scrap.py import time import stem.util.system print "Reading the whole file:" for i in range(3): start_time = time.time() with open('/tmp/long_file') as long_file: print long_file.readlines()[-3:] print 'took %s' % (time.time() - start_time) print "\nShelling out to tail:" for i in range(3): start_time = time.time() print stem.util.system.call('tail -n 3 /tmp/long_file') print 'took %s' % (time.time() - start_time) print "\nCalling our tail() function:" for i in range(3): start_time = time.time() print stem.util.system.tail('/tmp/long_file', 3) print 'took %s' % (time.time() - start_time) -------------------------------------------------------------------------------- % python scrap.py Reading the whole file: [' or the dense London fog\n', "but I'm with people you meet\n", ' both the wicked and sweet.\n'] took 0.546777009964 [' or the dense London fog\n', "but I'm with people you meet\n", ' both the wicked and sweet.\n'] took 0.518195152283 [' or the dense London fog\n', "but I'm with people you meet\n", ' both the wicked and sweet.\n'] took 0.519068956375 Shelling out to tail: [u'or the dense London fog', u"but I'm with people you meet", u' both the wicked and sweet.'] took 0.00712585449219 [u'or the dense London fog', u"but I'm with people you meet", u' both the wicked and sweet.'] took 0.00904107093811 [u'or the dense London fog', u"but I'm with people you meet", u' both the wicked and sweet.'] took 0.00874090194702 Calling our tail() function: [' or the dense London fog', "but I'm with people you meet", ' both the wicked and sweet.'] took 0.000432968139648 [' or the dense London fog', "but I'm with people you meet", ' both the wicked and sweet.'] took 0.000234842300415 [' or the dense London fog', "but I'm with people you meet", ' both the wicked and sweet.'] took 0.000171184539795 --- stem/util/system.py | 50 +++++++++++++++++++++++++++++++++++++++++++++- test/unit/util/system.py | 20 +++++++++++++++++++ test/unit/util/text_file | 14 +++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/stem/util/system.py b/stem/util/system.py index 2c15d23..f2d1bc8 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -30,6 +30,7 @@ best-effort, providing **None** if the lookup fails. cwd - provides the current working directory for a given process user - provides the user a process is running under start_time - provides the unix timestamp when the process started + tail - provides lines from the end of a file bsd_jail_id - provides the BSD jail id a given process is running within bsd_jail_path - provides the path of the given BSD jail @@ -37,7 +38,6 @@ best-effort, providing **None** if the lookup fails. expand_path - expands relative paths and ~ entries files_with_suffix - provides files with the given suffix - get_process_name - provides our process' name set_process_name - changes our process' name """ @@ -49,6 +49,7 @@ import os import platform import re import subprocess +import sys import tarfile import time @@ -88,6 +89,8 @@ GET_CWD_LSOF = 'lsof -a -p %s -d cwd -Fn' GET_BSD_JAIL_ID_PS = 'ps -p %s -o jid' GET_BSD_JAIL_PATH = 'jls -j %s' +BLOCK_SIZE = 1024 + # flag for setting the process name, found in '/usr/include/linux/prctl.h' PR_SET_NAME = 15 @@ -754,6 +757,51 @@ def start_time(pid): return None +def tail(target, lines = None): + """ + Provides the last lines from a file, similar to 'tail -n 50 /tmp/my_log'. + + :param str,file target: path or file object to read from + :param int lines: number of lines to read + + :returns: **list** of lines the file ends with + """ + + if isinstance(target, str): + with open(target) as target_file: + return tail(target_file, lines) + + if lines is None: + lines = sys.maxint + + # based on snippet from... + # https://stackoverflow.com/questions/136168/get-last-n-lines-of-a-file-with-… + + target.seek(0, 2) # go to the end of the file + block_end_byte = target.tell() + lines_left = lines + block_number = -1 + blocks = [] # blocks of size BLOCK_SIZE, in reverse order + + while lines_left > 0 and block_end_byte > 0: + if (block_end_byte - BLOCK_SIZE > 0): + # read the last block we haven't yet read + target.seek(block_number * BLOCK_SIZE, 2) + blocks.insert(0, target.read(BLOCK_SIZE)) + else: + # reached the start of the file, just read what's left + target.seek(0, 0) + blocks.insert(0, target.read(block_end_byte)) + + lines_found = blocks[-1].count('\n') + lines_left -= lines_found + block_end_byte -= BLOCK_SIZE + block_number -= 1 + + text = ''.join(blocks) + return text.splitlines()[-lines:] + + def bsd_jail_id(pid): """ Gets the jail id for a process. These seem to only exist for FreeBSD (this diff --git a/test/unit/util/system.py b/test/unit/util/system.py index f6e9f35..98cfb8d 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -7,6 +7,7 @@ system running the tests. import functools import ntpath +import os import posixpath import unittest @@ -371,6 +372,25 @@ class TestSystem(unittest.TestCase): expected_response = '/Users/atagar/tor/src/or' if test_input == '75717' else None self.assertEqual(expected_response, system.cwd(test_input)) + def test_tail(self): + """ + Exercise our tail() function with a variety of inputs. + """ + + path = os.path.join(os.path.dirname(__file__), 'text_file') + + # by file handle + + with open(path) as riddle_file: + self.assertEqual([' both the wicked and sweet.'], system.tail(riddle_file, 1)) + + self.assertEqual([], system.tail(path, 0)) + self.assertEqual([' both the wicked and sweet.'], system.tail(path, 1)) + self.assertEqual(["but I'm with people you meet", ' both the wicked and sweet.'], system.tail(path, 2)) + + self.assertEqual(14, len(system.tail(path))) + self.assertEqual(14, len(system.tail(path, 200))) + @patch('stem.util.system.call') @patch('stem.util.system.is_available', Mock(return_value = True)) def test_bsd_jail_id(self, call_mock): diff --git a/test/unit/util/text_file b/test/unit/util/text_file new file mode 100644 index 0000000..6c6d2ae --- /dev/null +++ b/test/unit/util/text_file @@ -0,0 +1,14 @@ +I'm in magic and books, + with spooks and the crooks, +and forbidden lover's bliss + after a vine trellis kiss. + +I might be open or closed, + often plain as your nose. +I'm a gift you can't take back, + and in the sharing I crack. + +Authors place me in Prague + or the dense London fog +but I'm with people you meet + both the wicked and sweet.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit f999f47aea0bc7639d2efdf615b8941ff9fc7d4f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 16:15:45 2015 +0000 Update translations for torbutton-torbuttonproperties --- lo/torbutton.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lo/torbutton.properties b/lo/torbutton.properties index cfe4289..70d5a4a 100644 --- a/lo/torbutton.properties +++ b/lo/torbutton.properties @@ -1,7 +1,7 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.internet = ອິນເຕີເນັດ +torbutton.circuit_display.ip_unknown = ບໍ່ຮູ້ຈັກ IP ນີ້ torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay @@ -31,10 +31,10 @@ torbutton.prefs.crucial = (crucial) torbutton.popup.external.title = ດາວໂຫຼດ ປະເພດ ຟາຍລ໌ ທາງນອກບໍ່? torbutton.popup.external.app = Tor ບໍ່ສາມາດສະແດງ ຟາຍລ໌ ນີ້ໄດ້. ທ່ານຈະຕ້ອງໄດ້ໄຂມັນດ້ວຍ ແອັບພຼີເຄຊັນ ໂຕໃໝ່.\n\n torbutton.popup.external.note = ບາງປະເພດຟາຍລ໌ ອາດເຮັດໃຫ້ ແອັບ ເຊື່ອມຕໍ່ໄປ ຍັງອິນເຕີເນັດ ໂດຍບໍ່ຕ້ອງ ໃຊ້ Tor ກໍໄດ້.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.external.suggest = :ພື່ອໃຫ້ປອດໄພ, ທ່ານຄວນຈະໄຂຟາຍລ໌ ທີ່ດາວໂຫຼດມາແລ້ວນັ້ນ ຕອນທີ່ບໍ່ໄດ້ເຊື່ອມຕໍ່ອອນລາຍຢູ່, ຫຼື ໃຫ້ໃຊ້ ແຜ່ນ ຊີດີ Tor :ອົາກໍໄດ້ ເຊັ່ນ Tails.\n +torbutton.popup.launch = ດາວໂຫຼດ ຟາຍລ໌ torbutton.popup.cancel = Cancel -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = ເປີດ ດາວໂຫຼດ ຟາຍລ໌ ອັດຕະໂນມັດ ດຽວນີ້ torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? @@ -59,12 +59,12 @@ torbutton.slider_notification = The green onion menu has now a security slider w torbutton.slider_notification_button = Open security settings # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=ເວັບຊາຍຕ໌ນີ້ (%S) ໄດ້ພະຍາຍາມ ຄາຍຂໍ້ມູນ ຂອບຮູບພາບ ທີ່ໃຊ້ພາສາ HTML5, ຊຶ່ງອາດຈະຖືກໃຊ້ເພື່ອລະບຸເອກະລັກ ຄັອມພິວເຕີຣ໌ ຂອງທ່ານ.\n\n\nຕົວທ່ອງເວັບ Tor ຄວນຈະອະນຸຍາດໃຫ້ເວັບໄຊຕ໌ ນີ້ ຄາຍລະຫັດ HTML5 ຂໍ້ມູນຂອບພາບນີ້ບໍ່? +canvas.notNow=ບໍ່ທັນແມ່ນດຽວນີ້ canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=ອະນຸຍາດໃນເທື່ອໜ້າພຸ້ນ. canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=ບໍ່ອະນຸຍາດໃຫ້ ເວັບໄຊຕ໌ນີ້ (ແນະນໍາ) canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation.

1 0

[tor-browser-bundle/master] Use https URLs for golang.org.
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit c0f7fa56c1a63cb5df18a3a4b55333ad6184252a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 21 15:37:56 2015 -0700 Use https URLs for golang.org. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b97ec8a..7ad0edb 100755 --- a/gitian/versions +++ b/gitian/versions @@ -119,4 +119,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=http://golang.org/dl/${GO_PACKAGE} +GO_URL=https://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 857b48f..c22890b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -126,5 +126,5 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=http://golang.org/dl/${GO_PACKAGE} +GO_URL=https://golang.org/dl/${GO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA… diff --git a/gitian/versions.beta b/gitian/versions.beta index bab8d15..19d117e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -119,4 +119,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=http://golang.org/dl/${GO_PACKAGE} +GO_URL=https://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2c62a88..2e4733e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -130,5 +130,5 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO_URL=http://golang.org/dl/${GO_PACKAGE} +GO_URL=https://golang.org/dl/${GO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA…

1 0

[tor-browser-bundle/master] Upgrade go to 1.4.2.
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit 4711e77ebda8c4fdbbb24110bf49d1b95d65d7c3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 21 15:41:13 2015 -0700 Upgrade go to 1.4.2. https://golang.org/doc/go1.4 https://golang.org/doc/devel/release.html#go1.4 --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7ad0edb..4b0c9a4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -48,7 +48,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=4.0.1 -GO_VER=1.3.3 +GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -93,7 +93,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e ## Non-git package URLs diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c22890b..2e6cd80 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -53,7 +53,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.2 -GO_VER=1.3.3 +GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,7 +99,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 diff --git a/gitian/versions.beta b/gitian/versions.beta index 19d117e..efb4bfb 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.3.3 +GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -94,7 +94,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2e4733e..cf0aecf 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -57,7 +57,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.2 -GO_VER=1.3.3 +GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -103,7 +103,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353

1 0

[tor/master] spelling fix
by nickm＠torproject.org 24 Mar '15

24 Mar '15

commit 8adecae09d509770cb41b6b056ef908f9f97a299 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 24 11:55:35 2015 -0400 spelling fix --- doc/HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HACKING b/doc/HACKING index 60029c3..7707cc7 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -566,7 +566,7 @@ on dist-master. 9) Email the packagers (cc'ing tor-assistants) that a new tarball is up. The current list of packagers is: {weasel,gk} at torproject dot org - {blueneess} at gentoo dot org + {blueness} at gentoo dot org 10) Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from

1 0

[tor-browser-bundle/master] Bug #14937: Hard-code meek and flashproxy node fingerprints
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit bb029bff85d1973a08340404be50f7ceee83f59e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 20 14:51:58 2015 -0700 Bug #14937: Hard-code meek and flashproxy node fingerprints See discussion in https://trac.torproject.org/projects/tor/ticket/14937?replyto=22#comment:17 and below. --- Bundle-Data/PTConfigs/bridge_prefs.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f4a4f41..8e7fd43 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -8,11 +8,11 @@ pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); -pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); -pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); -pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3"); -pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); -pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); +pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); +pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); +pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); +pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80 2BD466989944867075E872310EBAD65BC88C8AEF"); @@ -31,6 +31,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/14937'
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit 5a9179b065e3015381fc6ea5bf4dccb0b04d3dd6 Merge: 4cce67a bb029bf Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 24 15:43:19 2015 +0000 Merge remote-tracking branch 'arthur/14937' Bundle-Data/PTConfigs/bridge_prefs.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/14937+7'
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit 5ac0bb12aaceb954d124e1e65cd47c37e28fcaa7 Merge: 55d3976 c632162 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 24 15:41:45 2015 +0000 Merge remote-tracking branch 'arthur/14937+7' src/chrome/content/tor-circuit-display.js | 37 ++++++++++++++++------------- src/modules/tor-control-port.js | 4 +--- 2 files changed, 21 insertions(+), 20 deletions(-)

1 0

[torbutton/master] Bug 14937: Show meek and flashproxy bridges in tor circuit display
by gk＠torproject.org 24 Mar '15

24 Mar '15

commit c6321626cf04db74a8c08af19331c686757adc85 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Mar 21 16:32:07 2015 -0700 Bug 14937: Show meek and flashproxy bridges in tor circuit display --- src/chrome/content/tor-circuit-display.js | 37 ++++++++++++++++------------- src/modules/tor-control-port.js | 4 +--- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index a4ba919..8997757 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -47,7 +47,7 @@ let credentialsToNodeDataMap = {}, // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; +let trimQuotes = s => s ? s.match(/^"(.*)"$/)[1] : undefined; // __getBridge(id)__. // Gets the bridge parameters for a given node ID. If the node @@ -89,7 +89,8 @@ let nodeDataForID = function* (controller, id) { if (result.ip) { // Get the country code for the node's IP address. try { - result.countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + let countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + result.countryCode = countryCode === "??" ? null : countryCode; } catch (e) { } } return result; @@ -190,22 +191,24 @@ let showCircuitDisplay = function (show) { let nodeLines = function (nodeData) { let result = []; for (let {ip, countryCode, type, bridgeType} of nodeData) { - let bridge = type === "bridge"; + let bridge = type === "bridge", + country = countryCode ? localizedCountryNameFromCode(countryCode) : null; result.push( - // For each relay, show its apparent host country. - (countryCode ? localizedCountryNameFromCode(countryCode) - : uiString("unknown_country")) + - (bridge ? - // As we have a bridge, don't show the IP address - // but show the bridge type. - " (" + uiString("tor_bridge") + - ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + ")" - : - // As we don't have a bridge, show the IP address - // of the node. Use unicode escapes to ensure that - // parentheses behave properly in both left-to-right - // and right-to-left languages. - " ‭ (" + (ip || uiString("ip_unknown")) + ")‬")); + bridge ? + // As we have a bridge, don't show the IP address + // but show the bridge type. + (uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + + (country ? " (" + country + ")" : "")) + : + // For each non-bridge relay, show its host country and IP. + (country || uiString("unknown_country")) + + // As we don't have a bridge, show the IP address + // of the node. Use unicode escapes to ensure that + // parentheses behave properly in both left-to-right + // and right-to-left languages. + " ‭ (" + (ip || uiString("ip_unknown")) + ")‬" + ); } return result; }; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index a55a0d8..710643e 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -476,11 +476,9 @@ info.bridgeParser = function(bridgeLine) { // Several bridge types have a similar format: } else { result.type = tokens[0]; - if (["fte", "obfs3", "obfs4", "scramblesuit"] + if (["flashproxy", "fte", "meek", "obfs3", "obfs4", "scramblesuit"] .indexOf(result.type) >= 0) { [result.address, result.ID] = tokens.slice(1); - } else if (result.type === "meek") { - // do nothing for now } } return result.type ? result : null;

1 0