May 2017 - tor-commits - lists.torproject.org

[stem/master] Support lack of PATH in process tests
by atagar＠torproject.org 23 May '17

23 May '17

commit 3bf77ecf6e2d16eca768834f1e7da75e53eda6b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 23 16:32:29 2017 -0700 Support lack of PATH in process tests When tor lacks a path it includes some extra warnings even with 'hush'... % env -i /home/atagar/Desktop/tor/tor/src/or/tor --hush --hash-password my_password May 23 16:26:42.518 [warn] Couldn't find $HOME environment variable while expanding "~/.tor"; defaulting to "". May 23 16:26:42.518 [warn] Default DataDirectory is "~/.tor". This expands to "/.tor", which is probably not what you want. Using "/usr/local/var/tor" instead 16:CE3C1D5DA52940C860464AB6A01198BCC65E5E20402ED4AC90955F260D Accounting for this in the test by just checking the last line. --- test/integ/process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 1ca0f70..95c14cb 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -96,8 +96,8 @@ class TestProcess(unittest.TestCase): hush to cut it down. """ - output = self.run_tor('--hush', '--hash-password', 'my_password') - self.assertTrue(re.match('^16:[0-9A-F]{58}\n$', output)) + output = self.run_tor('--hush', '--hash-password', 'my_password').splitlines()[-1] + self.assertTrue(re.match('^16:[0-9A-F]{58}$', output)) # I'm not gonna even pretend to understand the following. Ported directly # from tor's test_cmdline_args.py.

1 0

[stem/master] Let tests pass without a PATH
by atagar＠torproject.org 23 May '17

23 May '17

commit 46fc50b4d1d9a3c006691af01f38f9ec80023b00 Merge: a9af1b6 3bf77ec Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 23 16:38:42 2017 -0700 Let tests pass without a PATH catalyst ran into some issues where stem's tests didn't pass on his setup... https://trac.torproject.org/projects/tor/ticket/22301 Tests now pass when I run... % env -i ./run_tests.py --all --tor ../tor/src/or/tor stem/util/system.py | 2 ++ test/integ/installation.py | 11 +++++------ test/integ/process.py | 4 ++-- test/integ/util/system.py | 4 ++++ 4 files changed, 13 insertions(+), 8 deletions(-)

1 0

[stem/master] Testing failures due to static fingerprints
by atagar＠torproject.org 23 May '17

23 May '17

commit a9af1b665b2aa85de6ecdc4011f6935fd0299804 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 23 14:13:06 2017 -0700 Testing failures due to static fingerprints Oops, dropping the random_fingerprint() helper caused a couple test failures that didn't show up on my laptop. When calling SETCONF we need the fingerprints to be different (though randomness doesn't matter) so events are triggered. --- test/integ/control/base_controller.py | 5 ++++- test/integ/control/controller.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 9f2fc44..294eaee 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -2,6 +2,8 @@ Integration tests for the stem.control.BaseController class. """ +import os +import hashlib import re import threading import time @@ -151,7 +153,8 @@ class TestBaseController(unittest.TestCase): controller.msg('SETEVENTS CONF_CHANGED') for i in range(10): - controller.msg('SETCONF NodeFamily=FD4CC275C5AA4D27A487C6CA29097900F85E2C33') + fingerprint = hashlib.sha1(os.urandom(20)).hexdigest().upper() + controller.msg('SETCONF NodeFamily=%s' % fingerprint) test.runner.exercise_controller(self, controller) controller.msg('SETEVENTS') diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 1e4e8e8..889ca0c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -159,7 +159,7 @@ class TestController(unittest.TestCase): buffer2_size = len(event_buffer2) - controller.set_conf('NodeFamily', 'FD4CC275C5AA4D27A487C6CA29097900F85E2C33') + controller.set_conf('NodeFamily', 'A82F7EFDB570F6BC801805D0328D30A99403C401') event_notice1.wait(10) self.assertEqual(len(event_buffer1), 2) event_notice1.clear() @@ -209,7 +209,7 @@ class TestController(unittest.TestCase): controller.connect() controller.authenticate(password = test.runner.CONTROL_PASSWORD) self.assertTrue(len(event_buffer) == 0) - controller.set_conf('NodeFamily', 'FD4CC275C5AA4D27A487C6CA29097900F85E2C33') + controller.set_conf('NodeFamily', 'A82F7EFDB570F6BC801805D0328D30A99403C401') event_notice.wait(4) self.assertTrue(len(event_buffer) >= 1)

1 0

[stem/master] Let installation test pass without a PATH
by atagar＠torproject.org 23 May '17

23 May '17

commit 594948cbc564ffb332fe7eb13e90558aeddc475b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 23 16:18:31 2017 -0700 Let installation test pass without a PATH When we lack a PATH sys.executable doesn't provide anything. However, invoking 'python' still seems to work. Not entirely sure why but meh. Weird situation and if this allows the test to now pass then neat. --- test/integ/installation.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 1cb9471..16da817 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -20,6 +20,7 @@ INSTALL_MISMATCH_MSG = "Running 'python setup.py sdist' doesn't match our git co BASE_INSTALL_PATH = '/tmp/stem_test' DIST_PATH = os.path.join(test.STEM_BASE, 'dist') SETUP_THREAD, INSTALL_FAILURE, INSTALL_PATH, SDIST_FAILURE = None, None, None, None +PYTHON_EXE = sys.executable if sys.executable else 'python' def setup(): @@ -35,12 +36,10 @@ def setup(): original_cwd = os.getcwd() try: - os.chdir(test.STEM_BASE) - try: os.chdir(test.STEM_BASE) - stem.util.system.call('%s setup.py install --prefix %s' % (sys.executable, BASE_INSTALL_PATH), timeout = 60) - stem.util.system.call('%s setup.py clean --all' % sys.executable, timeout = 60) # tidy up the build directory + stem.util.system.call('%s setup.py install --prefix %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60) + stem.util.system.call('%s setup.py clean --all' % PYTHON_EXE, timeout = 60) # tidy up the build directory site_packages_paths = glob.glob('%s/lib*/*/site-packages' % BASE_INSTALL_PATH) if len(site_packages_paths) != 1: @@ -52,7 +51,7 @@ def setup(): if not os.path.exists(DIST_PATH): try: - stem.util.system.call('%s setup.py sdist' % sys.executable, timeout = 60) + stem.util.system.call('%s setup.py sdist' % PYTHON_EXE, timeout = 60) except Exception as exc: SDIST_FAILURE = exc else: @@ -121,7 +120,7 @@ class TestInstallation(unittest.TestCase): if INSTALL_FAILURE: raise INSTALL_FAILURE - self.assertEqual(stem.__version__, stem.util.system.call([sys.executable, '-c', "import sys;sys.path.insert(0, '%s');import stem;print(stem.__version__)" % INSTALL_PATH])[0]) + self.assertEqual(stem.__version__, stem.util.system.call([PYTHON_EXE, '-c', "import sys;sys.path.insert(0, '%s');import stem;print(stem.__version__)" % INSTALL_PATH])[0]) _assert_has_all_files(INSTALL_PATH) @test.require.only_run_once

1 0

[stem/master] Fix minor checkstyle issue
by atagar＠torproject.org 23 May '17

23 May '17

commit d77615c2dc8e98089b727a2c32123fcc38a1f873 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 23 14:01:40 2017 -0700 Fix minor checkstyle issue Laptop and desktop have different checkstyle versions so this didn't come up when developing on the former... * /home/atagar/Desktop/stem/test/__init__.py line 23 - E402 module level import not at top of file | import itertools line 24 - E402 module level import not at top of file | import os line 26 - E402 module level import not at top of file | import stem.util.enum line 27 - E402 module level import not at top of file | import stem.version --- test/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index 355497c..8b5d576 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -13,6 +13,12 @@ Unit and integration tests for the stem library. Helpers include... tor_version - provides the version of tor we're testing against """ +import itertools +import os + +import stem.util.enum +import stem.version + __all__ = [ 'network', 'output', @@ -20,12 +26,6 @@ __all__ = [ 'runner', ] -import itertools -import os - -import stem.util.enum -import stem.version - # Integration targets fall into two categories: # # * Run Targets (like RUN_COOKIE and RUN_PTRACE) which customize our torrc.

1 0

[tor-launcher/master] Bug 22283: Linux 7.0a4 broken after update
by gk＠torproject.org 23 May '17

23 May '17

commit 123a3ed987bef91c006957394da0465132954b3f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 11:57:08 2017 -0400 Bug 22283: Linux 7.0a4 broken after update Improve our torrc fixup code to remove all ControlPort and SocksPort lines that contain a Unix domain socket, and execute the fixup one more time. This corrects a problem where the torrc of alpha channel users who transitioned from Unix domain sockets to TCP was left with ControlPort and SocksPort lines that contained bad paths (the parent directory for the Unix domain socket did not exist). --- src/components/tl-process.js | 51 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 3db394e..ca38e9c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -99,15 +99,16 @@ TorProcessService.prototype = } else if (TorLauncherUtil.shouldStartAndOwnTor) { - // If we have not already done so, perform a one-time fixup to remove - // any ControlPort and SocksPort lines from the user's torrc file that - // will conflict with the arguments we plan to pass when starting tor. - // See bug 20761. + // If we have not already done so, remove any ControlPort and + // SocksPort lines from the user's torrc file that may conflict + // with the arguments we plan to pass when starting tor. + // See bugs 20761 and 22283. + const kTorrcFixupVersion = 2; const kTorrcFixupPref = "extensions.torlauncher.torrc_fixup_version"; - if ((TorLauncherUtil.getIntPref(kTorrcFixupPref, 0) < 1) - && this._fixupTorrc()) + if ((TorLauncherUtil.getIntPref(kTorrcFixupPref, 0) + < kTorrcFixupVersion) && this._fixupTorrc()) { - TorLauncherUtil.setIntPref(kTorrcFixupPref, 1); + TorLauncherUtil.setIntPref(kTorrcFixupPref, kTorrcFixupVersion); } this._startTor(); @@ -839,12 +840,8 @@ TorProcessService.prototype = let matchResult = aLine.match(/\s*\+*controlport\s+(.*)/i); if (matchResult) { - if (controlIPCFile) - { - removeLine = this._valueContainsFilePath(matchResult[1], - controlIPCFile); - } - else + removeLine = this._valueIsUnixDomainSocket(matchResult[1]); + if (!removeLine && !controlIPCFile) { removeLine = this._valueContainsPort(matchResult[1], controlPort); @@ -857,12 +854,8 @@ TorProcessService.prototype = matchResult = aLine.match(/\s*\+*socksport\s+(.*)/i); if (matchResult) { - if (socksPortInfo.ipcFile) - { - removeLine = this._valueContainsFilePath(matchResult[1], - socksPortInfo.ipcFile); - } - else + removeLine = this._valueIsUnixDomainSocket(matchResult[1]); + if (!removeLine && !socksPortInfo.ipcFile) { removeLine = this._valueContainsPort(matchResult[1], socksPortInfo.port); @@ -1059,7 +1052,7 @@ TorProcessService.prototype = return lines; }, - _valueContainsFilePath: function(aValue, aFile) + _valueIsUnixDomainSocket: function(aValue) { // Handle several cases: // "unix:/path options" @@ -1068,23 +1061,7 @@ TorProcessService.prototype = if (aValue.startsWith('"')) aValue = this.mProtocolSvc.TorUnescapeString(aValue); - let path; - let matchResult = aValue.match(/^unix:("[^"]*")/); - if (matchResult) - path = this.mProtocolSvc.TorUnescapeString(matchResult[1]); - else - { - matchResult = aValue.match(/^unix:(\S*)/); - if (matchResult) - path = matchResult[1]; - } - - if (!path) - return false; - - let file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); - file.initWithPath(path); - return file.equals(aFile); + return aValue.startsWith("unix:"); }, _valueContainsPort: function(aValue, aPort)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 May '17

23 May '17

commit 1a35723cab613cdf16ce3ee0c08b3aa50c1efae7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 23 14:45:26 2017 +0000 Update translations for https_everywhere --- lo/https-everywhere.dtd | 30 +++++++++++++++--------------- lo/https-everywhere.properties | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lo/https-everywhere.dtd b/lo/https-everywhere.dtd index 5855174..b339328 100644 --- a/lo/https-everywhere.dtd +++ b/lo/https-everywhere.dtd @@ -18,28 +18,28 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "ບໍລິຈາກໃຫ້ແກ່ EFF"> <!ENTITY https-everywhere.menu.about "ກ່ຽວກັບ HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "ການຕັ້ງຄ່າສັງເກດການ SSL"> -<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.globalEnable "ເປີດໃຊ້ງານ HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "ອັດການໃຊ້ງານ HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "ກັ້ນທຸກໆການຮ້ອງຂໍທີ່ບໍ່ເຂົ້າລະຫັດ"> +<!ENTITY https-everywhere.menu.showCounter "ສະແດງເຄື່ອງນັບ"> +<!ENTITY https-everywhere.menu.viewAllRules "ສະແດງເບິ່ງກົດທັງໝົດ"> -<!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences"> +<!ENTITY https-everywhere.prefs.title "ການຕັ້ງຄ່າ HTTPS Everywhere"> <!ENTITY https-everywhere.prefs.enable_all "ເປີດນຳໃຊ້ທັງຫມົດ"> <!ENTITY https-everywhere.prefs.disable_all "ປິດນຳໃຊ້ທັງຫມົດ"> -<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults "ປັບຄືນເປັນຄ່າເລີ່ມຕົ້ນ"> <!ENTITY https-everywhere.prefs.search "ຄົ້ນຫາ"> -<!ENTITY https-everywhere.prefs.site "Site"> -<!ENTITY https-everywhere.prefs.notes "Notes"> -<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> +<!ENTITY https-everywhere.prefs.site "ເວັບໄຊຕ໌"> +<!ENTITY https-everywhere.prefs.notes "ໝາຍເຫດ"> +<!ENTITY https-everywhere.prefs.list_caption "ກົດການປ່ຽນທິດທາງໃດ HTTPS ທີ່ຄວນໃຊ້?"> <!ENTITY https-everywhere.prefs.enabled "ເປີດນຳໃຊ້ແລ້ວ"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "ທ່ານສາມາດຮຽນຂຽນຊຸດກົດຂອງທ່ານເອງໄດ້ (ເພື່ອເພີ່ມການສະໜັບສະໜູນ ໃຫ້ກັບເວັບໄຊຕ໌ອື່ນໆ)"> <!ENTITY https-everywhere.prefs.here_link "ທີ່ນີ້"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> -<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source"> +<!ENTITY https-everywhere.prefs.toggle "ໄກລັ່ນ"> +<!ENTITY https-everywhere.prefs.reset_default "ປັບຄືນເປັນຄ່າເລີ່ມຕົ້ນ"> +<!ENTITY https-everywhere.prefs.view_xml_source "ສະແດງເຍິ່ງ ແຫຼ່ງລະຫັດ XML"> -<!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> +<!ENTITY https-everywhere.chrome.stable_rules "ກົດທີ່ໝັ້ນຄົງ"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> diff --git a/lo/https-everywhere.properties b/lo/https-everywhere.properties index be83831..269b4a7 100644 --- a/lo/https-everywhere.properties +++ b/lo/https-everywhere.properties @@ -1,5 +1,5 @@ -https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.globalEnable = ເປີດໃຊ້ງານ HTTPS Everywhere +https-everywhere.menu.globalDisable = ອັດການໃຊ້ງານ HTTPS Everywhere https-everywhere.menu.enableDisable = Enable / Disable Rules https-everywhere.menu.noRules = (No Rules for This Page) https-everywhere.menu.unknownRules = (Rules for This Page Unknown)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 May '17

23 May '17

commit 36350fcb691410c2bc43253a03af319518b9ce49 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 23 14:15:31 2017 +0000 Update translations for liveusb-creator --- lo/lo.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lo/lo.po b/lo/lo.po index b65b333..5733b32 100644 --- a/lo/lo.po +++ b/lo/lo.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2017-02-17 03:13+0000\n" +"PO-Revision-Date: 2017-05-23 14:10+0000\n" "Last-Translator: Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>\n" "Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 May '17

23 May '17

commit 0a017804a41aa37a2b1fe8a22c2ef856749305c1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 23 14:15:23 2017 +0000 Update translations for https_everywhere --- lo/https-everywhere.dtd | 18 +++++++++--------- lo/ssl-observatory.dtd | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lo/https-everywhere.dtd b/lo/https-everywhere.dtd index 61ebc67..5855174 100644 --- a/lo/https-everywhere.dtd +++ b/lo/https-everywhere.dtd @@ -1,23 +1,23 @@ <!ENTITY https-everywhere.about.title "ກ່ຽວກັບ HTTPS ທຸກໆບ່ອນ"> <!ENTITY https-everywhere.about.ext_name "HTTPS ທຸກໆບ່ອນ"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.ext_description "ເຂົ້າລະຫັດເວັບ! ໃຊ້ ຄວາມປອດໄພ HTTPS ໃນຫລາຍໆເວັບໄຊຕ໌"> <!ENTITY https-everywhere.about.version "ເວີຊັນ"> -<!ENTITY https-everywhere.about.created_by "ສ້າງຂື້ນມາໂດຍ"> +<!ENTITY https-everywhere.about.created_by "ສ້າງໂດຍ"> <!ENTITY https-everywhere.about.and ", ແລະ"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> +<!ENTITY https-everywhere.about.librarians "ບັນນາລັກ ຊຸດຄຳສັ່ງ"> <!ENTITY https-everywhere.about.add_new_rule "ເພີ່ມກົດໃຫມ່"> <!ENTITY https-everywhere.about.thanks "ຂອບໃຈ"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> -<!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> -<!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> +<!ENTITY https-everywhere.about.many_contributors "ຜູ້ຮ່ວມໃຫ້ຂໍ້ມູນຫຼາກຫຼາຍ, ຮວມທັງ"> +<!ENTITY https-everywhere.about.noscript "ນອກຈາກນີ້, ບາງສ່ວນຂອງ HTTP ຢູ່ທົ່ວທຸກແຫ່ງ ຈະອີງຕາມລະຫັດ ຈາກ NoScript ໂດຍ Giorgio Maone ແລະ ອື່ນໆ. ພວກເຮົາຮູ້ບຸນຄຸນ ສຳລັບວຽກງານ ທີ່ດີເລີດຂອງພວກເຂົາ!"> +<!ENTITY https-everywhere.about.contribute "ຖ້າຫາກ ທ່ານ ມັກ HTTPS Everywhere, ທ່ານອາດ ພິຈາລະນາເອົາ"> <!ENTITY https-everywhere.about.donate_tor "ບໍລິຈາກໃຫ້ແກ່ Tor"> <!ENTITY https-everywhere.about.tor_lang_code "ອັງກິດ"> -<!ENTITY https-everywhere.about.or "ຫລື"> +<!ENTITY https-everywhere.about.or "ຫຼື"> <!ENTITY https-everywhere.about.donate_eff "ບໍລິຈາກໃຫ້ແກ່ EFF"> <!ENTITY https-everywhere.menu.donate_eff_imperative "ບໍລິຈາກໃຫ້ແກ່ EFF"> -<!ENTITY https-everywhere.menu.about "ກ່ຽວກັບ HTTPS ທຸກໆບ່ອນ"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> +<!ENTITY https-everywhere.menu.about "ກ່ຽວກັບ HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.observatory "ການຕັ້ງຄ່າສັງເກດການ SSL"> <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> diff --git a/lo/ssl-observatory.dtd b/lo/ssl-observatory.dtd index 683c452..df83a36 100644 --- a/lo/ssl-observatory.dtd +++ b/lo/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.show "Show advanced options"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "ການຕັ້ງຄ່າສັງເກດການ SSL"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">

1 0

[tor/master] Fix comments of functions that return tor_snprintf
by nickm＠torproject.org 23 May '17

23 May '17

commit af98b862a51c001efae1eae4f467e0c9b835953e Author: teor <teor2345(a)gmail.com> Date: Tue May 23 18:44:45 2017 +1000 Fix comments of functions that return tor_snprintf No code changes needed: in the places where we actually check the return value of these functions, we handle it correctly. --- src/common/address.c | 7 ++++--- src/common/util.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index c5d0e91..a6fd8c0 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -564,8 +564,8 @@ tor_addr_parse_PTR_name(tor_addr_t *result, const char *address, /** Convert addr to an in-addr.arpa name or a .ip6.arpa name, * and store the result in the outlen-byte buffer at - * out. Return the number of chars written to out, not - * including the trailing \0, on success. Returns -1 on failure. */ + * out. Returns a non-negative integer on success. + * Returns -1 on failure. */ int tor_addr_to_PTR_name(char *out, size_t outlen, const tor_addr_t *addr) @@ -2051,7 +2051,8 @@ parse_port_range(const char *port, uint16_t *port_min_out, /** Given an IPv4 in_addr struct *in (in network order, as usual), * write it as a string into the buf_len-byte buffer in - * buf. + * buf. Returns a non-negative integer on success. + * Returns -1 on failure. */ int tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len) diff --git a/src/common/util.c b/src/common/util.c index 4babc4a..745b3a8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1953,7 +1953,7 @@ parse_http_time(const char *date, struct tm *tm) /** Given an interval in seconds, try to write it to the * out_len-byte buffer in out in a human-readable form. - * Return 0 on success, -1 on failure. + * Returns a non-negative integer on success, -1 on failure. */ int format_time_interval(char *out, size_t out_len, long interval)

1 0