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

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 4ff5f54e98e43957fe7652d10ec5ab30b73206d6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 18:17:54 2019 +0000 Update translations for tbmanual-contentspot --- contents+da.po | 58 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/contents+da.po b/contents+da.po index 0ca790cd8..c00ac358b 100644 --- a/contents+da.po +++ b/contents+da.po @@ -118,7 +118,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) msgid "##### How Tor works" -msgstr "" +msgstr "##### Hvordan Tor virker" #: https//tb-manual.torproject.org/en-US/about/ #: (content/about/contents+en-US.lrtopic.body) @@ -191,7 +191,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "##### Mirrors" -msgstr "" +msgstr "##### Spejle" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -205,7 +205,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "##### GetTor" -msgstr "" +msgstr "##### GetTor" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -218,7 +218,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via email:" -msgstr "" +msgstr "###### Brug GetTor via e-mail:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -242,7 +242,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via Twitter:" -msgstr "" +msgstr "###### Brug GetTor via Twitter:" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -255,7 +255,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) msgid "###### To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):" -msgstr "" +msgstr "###### Brug GetTor via Jabber/XMPP (Jitsi, CoyIM osv.):" #: https//tb-manual.torproject.org/en-US/downloading/ #: (content/downloading/contents+en-US.lrtopic.body) @@ -287,7 +287,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) msgid "##### Connect" -msgstr "" +msgstr "##### Opret forbindelse" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -310,7 +310,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) msgid "##### Configure" -msgstr "" +msgstr "##### Konfigurer" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.body) @@ -392,7 +392,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) msgid "##### Getting bridge addresses" -msgstr "" +msgstr "##### Henter broadresser" #: https//tb-manual.torproject.org/en-US/bridges/ #: (content/bridges/contents+en-US.lrtopic.body) @@ -781,7 +781,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### The URL bar" -msgstr "" +msgstr "##### URL-linjen" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -829,7 +829,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### Logging in over Tor" -msgstr "" +msgstr "##### Indlogning over Tor" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -880,7 +880,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "##### Changing identities and circuits" -msgstr "" +msgstr "##### Skift identitet og kredsløb" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -897,7 +897,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "###### New Identity" -msgstr "" +msgstr "###### Ny identitet" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -913,7 +913,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) msgid "###### New Tor circuit for this site" -msgstr "" +msgstr "###### Nyt Tor-kredsløb til stedet" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.body) @@ -987,7 +987,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) msgid "##### How to access an onion service" -msgstr "" +msgstr "##### Tilgå en onion-adresse" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) @@ -1010,7 +1010,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) msgid "##### Troubleshooting" -msgstr "" +msgstr "##### Fejlfinding" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body) @@ -1105,7 +1105,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/secure-connections/ #: (content/secure-connections/contents+en-US.lrtopic.body) msgid "##### Potentially visible data" -msgstr "" +msgstr "##### Potentiel synlig data" #: https//tb-manual.torproject.org/en-US/secure-connections/ #: (content/secure-connections/contents+en-US.lrtopic.body) @@ -1240,7 +1240,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Slider" -msgstr "" +msgstr "##### Tilgå sikkerhedsskyderen" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1260,7 +1260,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) msgid "##### Security Levels" -msgstr "" +msgstr "##### Sikkerhedsniveauer" #: https//tb-manual.torproject.org/en-US/security-slider/ #: (content/security-slider/contents+en-US.lrtopic.body) @@ -1365,7 +1365,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) msgid "##### Accessing the Security Settings" -msgstr "" +msgstr "##### Tilgå sikkerhedsindstillingerne" #: https//tb-manual.torproject.org/en-US/security-settings/ #: (content/security-settings/contents+en-US.lrtopic.body) @@ -1469,7 +1469,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) msgid "##### Updating Tor Browser automatically" -msgstr "" +msgstr "##### Automatisk opdatering af Tor Browser" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) @@ -1514,7 +1514,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) msgid "##### Updating Tor Browser manually" -msgstr "" +msgstr "##### Manuel opdatering af Tor Browser" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.body) @@ -1553,7 +1553,7 @@ msgstr "Sådan håndterer Tor Browser-tilføjelser, -plugins og -JavaScript" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### Flash Player" -msgstr "" +msgstr "##### Flash-afspiller" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1580,7 +1580,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### JavaScript" -msgstr "" +msgstr "##### JavaScript" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1623,7 +1623,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) msgid "##### Browser Add-ons" -msgstr "" +msgstr "##### Browser-tilføjelser" #: https//tb-manual.torproject.org/en-US/plugins/ #: (content/plugins/contents+en-US.lrtopic.body) @@ -1663,7 +1663,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Quick fixes" -msgstr "" +msgstr "##### Hurtige rettelser" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1712,7 +1712,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Is your connection censored?" -msgstr "" +msgstr "##### Er din forbindelse censureret?" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1725,7 +1725,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) msgid "##### Known issues" -msgstr "" +msgstr "##### Kendte problemer" #: https//tb-manual.torproject.org/en-US/troubleshooting/ #: (content/troubleshooting/contents+en-US.lrtopic.body) @@ -1899,6 +1899,8 @@ msgid "" "Trademark, copyright notices, and rules for use by third parties can be " "found in our " msgstr "" +"Varemærke, ophavsretsnotitser og regler for brug af tredjeparter findes i " +"vores " #: templates/layout.html:8 msgid "Tor Project | Tor Browser Manual"

1 0

[nyx/master] Use controller's get_start_time() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 9835944a4fb3ab457733c3812b3fd4ba9c4bb6d1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 3 10:20:23 2019 -0700 Use controller's get_start_time() method Tor just added a getinfo option to retrieve our uptime, so taking advantage of it here. As a new method naturally this is only present at the moment in the stem git repo. From a user perspective this should be transparent. Nyx will now present uptime when connected to a remote tor process and under the covers we make one fewer system calls, but that's about all. --- nyx/panel/header.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 2558b5e..370f3ee 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -277,7 +277,7 @@ class Sampling(object): 'auth_type': auth_type, 'pid': pid, - 'start_time': stem.util.system.start_time(pid), + 'start_time': controller.get_start_time(0), 'fd_limit': int(controller.get_info('process/descriptor-limit', '-1')), 'fd_used': fd_used,

1 0

[nyx/master] Nyx development version tag
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit f8ad2730ab5d85a302607524f0e9e10d640cf869 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 12 15:34:52 2019 -0800 Nyx development version tag --- nyx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 64cf220..f58a33d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -89,7 +89,7 @@ except ImportError: sys.exit(1) -__version__ = '2.1.0' +__version__ = '2.1.0-dev' __release_date__ = 'January 12, 2019' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org'

1 0

[stem/master] Add a get_uptime() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 0081c9a6122ac3fbb967da0f7228317f170eae38 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 2 11:03:02 2019 -0700 Add a get_uptime() method Taking advantage of our new getinfo option for determining the tor process runtime. https://trac.torproject.org/projects/tor/ticket/25132 https://gitweb.torproject.org/torspec.git/commit/?id=e9ef624 --- docs/change_log.rst | 1 + stem/control.py | 44 +++++++++++++++++++++++++++++++++++++++++ stem/version.py | 2 ++ test/unit/control/controller.py | 25 +++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 89626ca4..5c0208cb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.get_uptime` method to the :class:`~stem.control.Controller` * Controller events could fail to be delivered in a timely fashion (:trac:`27173`) * Adjusted :func:`~stem.control.Controller.get_microdescriptors` fallback to also use '.new' cache files (:trac:`28508`) * **DORMANT** and **ACTIVE** :data:`~stem.Signal` (:spec:`4421149`) diff --git a/stem/control.py b/stem/control.py index ce2d79a4..b4436af0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -84,6 +84,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_protocolinfo - information about the controller interface |- get_user - provides the user tor is running as |- get_pid - provides the pid of our tor process + |- get_uptime - duration tor has been running |- is_user_traffic_allowed - checks if we send or receive direct user traffic | |- get_microdescriptor - querying the microdescriptor for a relay @@ -1650,6 +1651,49 @@ class Controller(BaseController): else: raise ValueError("Unable to resolve tor's pid" if self.is_localhost() else "Tor isn't running locally") + @with_default() + def get_uptime(self, default = UNDEFINED): + """ + get_uptime(default = UNDEFINED) + + Provides the duration in seconds that tor has been running. + + .. versionadded:: 1.8.0 + + :param object default: response if the query fails + + :returns: **int** for the number of seconds tor has been running + + :raises: **ValueError** if unable to determine the uptime and no default + was provided + """ + + if self.get_version() >= stem.version.Requirement.GETINFO_UPTIME: + uptime = self.get_info('uptime', None) + + if uptime and uptime.isdigit(): + return int(uptime) + else: + raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) + else: + # Tor doesn't yet support this GETINFO option, attempt to determine the + # uptime of the process ourselves. + + if not self.is_localhost(): + raise ValueError('Unable to determine the uptime when tor is not running locally') + + pid = self.get_pid(None) + + if not pid: + raise ValueError('Unable to determine the pid of the tor process') + + start_time = stem.util.system.start_time(pid) + + if not start_time: + raise ValueError('Unable to determine when the tor process began') + + return time.time() - start_time + def is_user_traffic_allowed(self): """ Checks if we're likely to service direct user traffic. This essentially diff --git a/stem/version.py b/stem/version.py index 21dc3a0b..c13db22c 100644 --- a/stem/version.py +++ b/stem/version.py @@ -64,6 +64,7 @@ easily parsed and compared, for instance... **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query **GETINFO_GEOIP_AVAILABLE** 'GETINFO ip-to-country/ipv4-available' query and its ipv6 counterpart **GETINFO_MICRODESCRIPTORS** 'GETINFO md/all' query + **GETINFO_UPTIME** 'GETINFO uptime' query **HIDDEN_SERVICE_V3** Support for v3 hidden services **HSFETCH** HSFETCH requests **HSFETCH_V3** HSFETCH for version 3 hidden services @@ -379,6 +380,7 @@ Requirement = stem.util.enum.Enum( ('GETINFO_CONFIG_TEXT', Version('0.2.2.7-alpha')), ('GETINFO_GEOIP_AVAILABLE', Version('0.3.2.1-alpha')), ('GETINFO_MICRODESCRIPTORS', Version('0.3.5.1-alpha')), + ('GETINFO_UPTIME', Version('0.3.5.1-alpha')), ('HIDDEN_SERVICE_V3', Version('0.3.3.1-alpha')), ('HSFETCH', Version('0.2.7.1-alpha')), ('HSFETCH_V3', Version('0.4.1.1-alpha')), diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 13d26c4b..f5e63771 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -562,6 +562,31 @@ class TestControl(unittest.TestCase): self.assertEqual(432, self.controller.get_pid()) + @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.5.0.14'))) + @patch('stem.control.Controller.get_info') + def test_get_uptime_by_getinfo(self, getinfo_mock): + """ + Exercise the get_uptime() resolution via a GETINFO query. + """ + + getinfo_mock.return_value = '321' + self.assertEqual(321, self.controller.get_uptime()) + + getinfo_mock.return_value = 'abc' + self.assertRaisesWith(ValueError, "'GETINFO uptime' did not provide a valid numeric response: abc", self.controller.get_uptime) + + @patch('stem.socket.ControlSocket.is_localhost', Mock(return_value = True)) + @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.1.0.14'))) + @patch('stem.control.Controller.get_pid', Mock(return_value = '12')) + @patch('stem.util.system.start_time', Mock(return_value = 5000.0)) + @patch('time.time', Mock(return_value = 5200.0)) + def test_get_uptime_by_process(self): + """ + Exercise the get_uptime() resolution via process age. + """ + + self.assertEqual(200, self.controller.get_uptime()) + @patch('stem.control.Controller.get_info') def test_get_network_status_for_ourselves(self, get_info_mock): """

1 0

[stem/master] Add a get_start_time() method
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 9b1897578aca4a8befda999efcc5ad64aaf646ed Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 2 11:05:22 2019 -0700 Add a get_start_time() method On reflection, process initialization time is cachable whereas uptime is not. Adding a get_start_time() method, not only for its own usefulness but because it inherrantly lets us make get_uptime() a cached method. --- docs/change_log.rst | 1 + stem/control.py | 72 +++++++++++++++++++++++++++++------------ test/unit/control/controller.py | 7 ++-- 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 5c0208cb..f188c885 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.get_start_time` method to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_uptime` method to the :class:`~stem.control.Controller` * Controller events could fail to be delivered in a timely fashion (:trac:`27173`) * Adjusted :func:`~stem.control.Controller.get_microdescriptors` fallback to also use '.new' cache files (:trac:`28508`) diff --git a/stem/control.py b/stem/control.py index b4436af0..3ea3752f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -84,6 +84,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_protocolinfo - information about the controller interface |- get_user - provides the user tor is running as |- get_pid - provides the pid of our tor process + |- get_start_time - timestamp when the tor process began |- get_uptime - duration tor has been running |- is_user_traffic_allowed - checks if we send or receive direct user traffic | @@ -1582,8 +1583,10 @@ class Controller(BaseController): user = self._get_cache('user') - if not user: - user = self.get_info('process/user', None) + if user: + return user + + user = self.get_info('process/user', None) if not user and self.is_localhost(): pid = self.get_pid(None) @@ -1618,11 +1621,13 @@ class Controller(BaseController): pid = self._get_cache('pid') - if not pid: - getinfo_pid = self.get_info('process/pid', None) + if pid: + return pid - if getinfo_pid and getinfo_pid.isdigit(): - pid = int(getinfo_pid) + getinfo_pid = self.get_info('process/pid', None) + + if getinfo_pid and getinfo_pid.isdigit(): + pid = int(getinfo_pid) if not pid and self.is_localhost(): pid_file_path = self.get_conf('PidFile', None) @@ -1652,30 +1657,37 @@ class Controller(BaseController): raise ValueError("Unable to resolve tor's pid" if self.is_localhost() else "Tor isn't running locally") @with_default() - def get_uptime(self, default = UNDEFINED): + def get_start_time(self, default = UNDEFINED): """ - get_uptime(default = UNDEFINED) + get_start_time(default = UNDEFINED) - Provides the duration in seconds that tor has been running. + Provides when the tor process began. .. versionadded:: 1.8.0 :param object default: response if the query fails - :returns: **int** for the number of seconds tor has been running + :returns: **float** for the unix timestamp of when the tor process began - :raises: **ValueError** if unable to determine the uptime and no default - was provided + :raises: **ValueError** if unable to determine when the process began and + no default was provided """ + start_time = self._get_cache('start_time') + + if start_time: + return start_time + if self.get_version() >= stem.version.Requirement.GETINFO_UPTIME: uptime = self.get_info('uptime', None) - if uptime and uptime.isdigit(): - return int(uptime) - else: - raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) - else: + if uptime: + if not uptime.isdigit(): + raise ValueError("'GETINFO uptime' did not provide a valid numeric response: %s" % uptime) + + start_time = time.time() - float(uptime) + + if not start_time and self.is_localhost(): # Tor doesn't yet support this GETINFO option, attempt to determine the # uptime of the process ourselves. @@ -1689,10 +1701,30 @@ class Controller(BaseController): start_time = stem.util.system.start_time(pid) - if not start_time: - raise ValueError('Unable to determine when the tor process began') + if start_time: + self._set_cache({'start_time': start_time}) + return start_time + else: + raise ValueError("Unable to resolve when tor began" if self.is_localhost() else "Tor isn't running locally") + + @with_default() + def get_uptime(self, default = UNDEFINED): + """ + get_uptime(default = UNDEFINED) + + Provides the duration in seconds that tor has been running. + + .. versionadded:: 1.8.0 + + :param object default: response if the query fails + + :returns: **float** for the number of seconds tor has been running + + :raises: **ValueError** if unable to determine the uptime and no default + was provided + """ - return time.time() - start_time + return time.time() - self.get_start_time() def is_user_traffic_allowed(self): """ diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index f5e63771..94c1b65f 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -563,14 +563,17 @@ class TestControl(unittest.TestCase): self.assertEqual(432, self.controller.get_pid()) @patch('stem.control.Controller.get_version', Mock(return_value = stem.version.Version('0.5.0.14'))) + @patch('stem.socket.ControlSocket.is_localhost', Mock(return_value = False)) @patch('stem.control.Controller.get_info') + @patch('time.time', Mock(return_value = 1000.0)) def test_get_uptime_by_getinfo(self, getinfo_mock): """ Exercise the get_uptime() resolution via a GETINFO query. """ getinfo_mock.return_value = '321' - self.assertEqual(321, self.controller.get_uptime()) + self.assertEqual(321.0, self.controller.get_uptime()) + self.controller.clear_cache() getinfo_mock.return_value = 'abc' self.assertRaisesWith(ValueError, "'GETINFO uptime' did not provide a valid numeric response: abc", self.controller.get_uptime) @@ -585,7 +588,7 @@ class TestControl(unittest.TestCase): Exercise the get_uptime() resolution via process age. """ - self.assertEqual(200, self.controller.get_uptime()) + self.assertEqual(200.0, self.controller.get_uptime()) @patch('stem.control.Controller.get_info') def test_get_network_status_for_ourselves(self, get_info_mock):

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 4a9d151064e0718ee184139bd64d5e0deb6c5ca2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 17:47:54 2019 +0000 Update translations for tbmanual-contentspot --- contents+da.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+da.po b/contents+da.po index cc653d818..0ca790cd8 100644 --- a/contents+da.po +++ b/contents+da.po @@ -269,7 +269,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.title) msgid "Running Tor Browser for the first time" -msgstr "Kører Tor Browser for første gang" +msgstr "Kør Tor Browser for første gang" #: https//tb-manual.torproject.org/en-US/running-tor-browser/ #: (content/running-tor-browser/contents+en-US.lrtopic.description) @@ -751,7 +751,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.title) msgid "Managing identities" -msgstr "Håndterings af identiteter" +msgstr "Håndtering af identiteter" #: https//tb-manual.torproject.org/en-US/managing-identities/ #: (content/managing-identities/contents+en-US.lrtopic.description) @@ -937,7 +937,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.title) msgid "Onion Services" -msgstr "" +msgstr "Onion-tjenester" #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.description) @@ -1442,7 +1442,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.title) msgid "Updating" -msgstr "Opdaterer" +msgstr "Opdatering" #: https//tb-manual.torproject.org/en-US/updating/ #: (content/updating/contents+en-US.lrtopic.description) @@ -1825,7 +1825,7 @@ msgstr "" #: https//tb-manual.torproject.org/en-US/uninstalling/ #: (content/uninstalling/contents+en-US.lrtopic.title) msgid "Uninstalling" -msgstr "Afinstallerer" +msgstr "Afinstallering" #: https//tb-manual.torproject.org/en-US/uninstalling/ #: (content/uninstalling/contents+en-US.lrtopic.description)

1 0

[doctor/master] Loosen netbsd package version parsing
by atagar＠torproject.org 03 Apr '19

03 Apr '19

commit 90777b92680fc56562cd3b58b9678b2244e83c8d Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 3 09:35:04 2019 -0700 Loosen netbsd package version parsing Recently netbsd changed its tor version to "0.3.5.8nb2"... http://pkgsrc.se/net/tor Clearly the 'nb2' suffix isn't part of our upstream version. I'm not entirely sure what it means (maybe a re-packaging of 0.3.5.8?). Adjusting the version parsing I use for netbsd to ignore it. --- package_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.py b/package_versions.py index ecb1e6f..da97d7e 100755 --- a/package_versions.py +++ b/package_versions.py @@ -23,7 +23,7 @@ AUR_VERSION = '<h2>Package Details: \S+ ([0-9\.]+)-\S+</h2>' FREEBSD_VERSION = 'SHA256 $\S+-([0-9\.]+).tar.[gx]z$' OPENBSD_DIST_VERSION = 'DISTNAME\s*=\s+\S+-([0-9\.]+)' OPENBSD_EGG_VERSION = 'MODPY_EGG_VERSION =\s+([0-9\.]+)' -NETBSD_VERSION = 'CURRENT, <b>Version: </b>([0-9\.]+),' +NETBSD_VERSION = 'CURRENT, <b>Version: </b>([0-9\.]+)[a-z0-9]*,' COLUMN = '| %-10s | %-10s | %-10s | %-50s |' DIV = '+%s+%s+%s+%s+' % ('-' * 12, '-' * 12, '-' * 12, '-' * 52)

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 860ccf04c5f6eb16067486aecceb4de4dd675658 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:21:21 2019 +0000 Update translations for whisperback --- sw/sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index e20e66cf7..a0f788640 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -5,11 +5,11 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2018-08-07 08:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit 43e4cf0509153e9998dcb5124bddda1659667e2e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:20:50 2019 +0000 Update translations for tor-launcher-network-settings --- sw/network-settings.dtd | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd new file mode 100644 index 000000000..c6c5687ee --- /dev/null +++ b/sw/network-settings.dtd @@ -0,0 +1,62 @@ +<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> + + +<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.prompt "Please select a language."> + + + +<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connect "Connect"> + + + +<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigure"> + +<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> + +<!ENTITY torsettings.optional "Optional"> + +<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> +<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> + +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> + +<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> + +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> +<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> + + +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 03 Apr '19

03 Apr '19

commit c256ad692417e60ff048001d209c92b30b5517a1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 3 16:20:39 2019 +0000 Update translations for tor-launcher-properties --- sw/torlauncher.properties | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/sw/torlauncher.properties b/sw/torlauncher.properties new file mode 100644 index 000000000..ca9774bc4 --- /dev/null +++ b/sw/torlauncher.properties @@ -0,0 +1,94 @@ +### Copyright (c) 2016, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Tor Launcher + +torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). + +torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +torlauncher.tor_missing=The Tor executable is missing. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.password_hash_missing=Failed to get hashed password. + +torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +torlauncher.ensure_tor_is_running=Please ensure that Tor is running. + +torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.bridge_suffix.meek-amazon=(works in China) +torlauncher.bridge_suffix.meek-azure=(works in China) + +torlauncher.request_a_bridge=Request a Bridge… +torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. +torlauncher.no_bridges_available=No bridges are available at this time. Sorry. + +torlauncher.connect=Connect +torlauncher.restart_tor=Restart Tor +torlauncher.quit=Quit +torlauncher.quit_win=Exit +torlauncher.done=Done + +torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S + +torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. + +torlauncher.bootstrapStatus.starting=Starting +torlauncher.bootstrapStatus.conn_pt=Connecting to bridge +torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge +torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy +torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy +torlauncher.bootstrapStatus.conn=Connecting to a Tor relay +torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay +torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay +torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection +torlauncher.bootstrapStatus.requesting_status=Retrieving network status +torlauncher.bootstrapStatus.loading_status=Loading network status +torlauncher.bootstrapStatus.loading_keys=Loading authority certificates +torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information +torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information +torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge +torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge +torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy +torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy +torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay +torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay +torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay +torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit +torlauncher.bootstrapStatus.done=Connected to the Tor network! + +torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.resourcelimit=insufficient resources +torlauncher.bootstrapWarning.identity=identity mismatch +torlauncher.bootstrapWarning.timeout=connection timeout +torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.ioerror=read/write error +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport + +torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.

1 0