September 2013 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit 7bda8128d36795c7cb39cc38a678bb413e2c046a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:46:18 2013 +0000 Update translations for tor-launcher-network-settings_completed --- sv/network-settings.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index ae0c743..64ff819 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -27,6 +27,7 @@  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> +<!ENTITY torsettings.restart "Starta om"> <!ENTITY torsettings.optional "Valfri">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit efe79fccd8aa19c6cdeb4f0072d560c8e1a9cff8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:46:16 2013 +0000 Update translations for tor-launcher-network-settings --- sv/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd index 87607d8..64ff819 100644 --- a/sv/network-settings.dtd +++ b/sv/network-settings.dtd @@ -27,7 +27,7 @@  <!ENTITY torsettings.startingTor "Väntar på att Tor ska starta..."> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.restart "Starta om"> <!ENTITY torsettings.optional "Valfri">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit 6963054fe2c71cf3a503c70e1b01d4f6fc2e864c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:46:12 2013 +0000 Update translations for tor-launcher-properties_completed --- sv/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index 01e1d39..e1a4e63 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor stängdes av oväntat. +torlauncher.please_restart_app=Var god starta om det här programmet. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en Tor nätverksanslutning.\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit 183d3f3733c3114c09fdf55d8e646802392f5226 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:46:09 2013 +0000 Update translations for tor-launcher-properties --- sv/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties index b3ba104..e1a4e63 100644 --- a/sv/torlauncher.properties +++ b/sv/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor stängdes av oväntat. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Var god starta om det här programmet. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en Tor nätverksanslutning.\n\n%S

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit b326d072ab4567185ee54afa1b8e2fed19296c6c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:46:02 2013 +0000 Update translations for torbirdy --- sv/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd index eebbb17..31ca53f 100644 --- a/sv/torbirdy.dtd +++ b/sv/torbirdy.dtd @@ -18,7 +18,7 @@ <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label ""> <!ENTITY torbirdy.prefs.privacy.label ""> -<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> <!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Använd rekommenderade proxyinställningar för TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Sep '13

17 Sep '13

commit 6feba3e0b10b995b01203eaf582cfb7bce194dc0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 06:15:03 2013 +0000 Update translations for bridgedb --- km/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po index 8c2e4f4..6d6b927 100644 --- a/km/LC_MESSAGES/bridgedb.po +++ b/km/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Translators: +# soksophea <sophea(a)open.org.kh>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-09-16 17:15+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-17 05:50+0000\n" +"Last-Translator: soksophea <sophea(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:33 msgid "What are bridges?" -msgstr "" +msgstr "តើស្ពានជាអ្វី?" #: lib/bridgedb/templates/base.html:34 #, python-format

1 0

[tor/master] Fix a memory leak on getaddrinfo in sandbox. Found by coverity
by nickm＠torproject.org 17 Sep '13

17 Sep '13

commit 1825674bd31506efe5afbf91c244919204ca5af4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 16 22:38:02 2013 -0400 Fix a memory leak on getaddrinfo in sandbox. Found by coverity --- src/common/sandbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index ddfa84b..aaba9c7 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1184,6 +1184,7 @@ sandbox_add_addrinfo(const char* name) if (ret) { log_err(LD_BUG,"(Sandbox) failed to getaddrinfo"); ret = -2; + tor_free(el); goto out; }

1 0

[tor/master] Clean up malloc issues in sandbox.c
by nickm＠torproject.org 17 Sep '13

17 Sep '13

commit 4ea9fbcdb1feccb3e54ec83b201465252752f046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 16 22:34:42 2013 -0400 Clean up malloc issues in sandbox.c tor_malloc returns void *; in C, it is not necessary to cast a void* to another pointer type before assigning it. tor_malloc fails with an error rather than returning NULL; it's not necessary to check its output. (In one case, doing so annoyed Coverity.) --- src/common/sandbox.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 33ffd33..ddfa84b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -941,15 +941,8 @@ new_element(int syscall, int index, intptr_t value) { smp_param_t *param = NULL; - sandbox_cfg_t *elem = (sandbox_cfg_t*) tor_malloc(sizeof(sandbox_cfg_t)); - if (!elem) - return NULL; - - elem->param = (smp_param_t*) tor_malloc(sizeof(smp_param_t)); - if (!elem->param) { - tor_free(elem); - return NULL; - } + sandbox_cfg_t *elem = tor_malloc(sizeof(sandbox_cfg_t)); + elem->param = tor_malloc(sizeof(smp_param_t)); param = elem->param; param->syscall = syscall; @@ -1148,12 +1141,10 @@ sandbox_getaddrinfo(const char *name, const char *servname, for (el = sb_addr_info; el; el = el->next) { if (!strcmp(el->name, name)) { - *res = (struct addrinfo *) tor_malloc(sizeof(struct addrinfo)); - if (!res) { - return -2; - } + *res = tor_malloc(sizeof(struct addrinfo)); memcpy(*res, el->info, sizeof(struct addrinfo)); + /* XXXX What if there are multiple items in the list? */ return 0; } } @@ -1183,12 +1174,7 @@ sandbox_add_addrinfo(const char* name) struct addrinfo hints; sb_addr_info_t *el = NULL; - el = (sb_addr_info_t*) tor_malloc(sizeof(sb_addr_info_t)); - if (!el) { - log_err(LD_BUG,"(Sandbox) failed to allocate addr info!"); - ret = -2; - goto out; - } + el = tor_malloc(sizeof(sb_addr_info_t)); memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET;

1 0

[arm/master] Revised style for start_arm()
by atagar＠torproject.org 17 Sep '13

17 Sep '13

commit 76f502010477cd5c2df23bcaf3805b12a22e414b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 16 17:24:29 2013 -0700 Revised style for start_arm() Renaming startTorMonitor() to start_arm() and revising it to be PEP8 compliant. Still need to untangle this mess, though... --- arm/controller.py | 40 ++++++++++++++++++++-------------------- arm/starter.py | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 2fa0027..2d5866b 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -507,20 +507,20 @@ def connResetListener(controller, eventType, _): except ValueError: pass -def startTorMonitor(startTime): +def start_arm(start_time): """ Initializes the interface and starts the main draw loop. - Arguments: - startTime - unix time for when arm was started + :param float start_time: unix timestamp for when arm was started """ # attempts to fetch the tor pid, warning if unsuccessful (this is needed for # checking its resource usage, among other things) - conn = torTools.getConn() - torPid = conn.controller.get_pid(None) - if not torPid and conn.isAlive(): + controller = torTools.getConn().controller + tor_pid = controller.get_pid(None) + + if not tor_pid: log.warn("Unable to determine Tor's pid. Some information, like its resource usage will be unavailable.") # adds events needed for arm functionality to the torTools REQ_EVENTS @@ -534,7 +534,7 @@ def startTorMonitor(startTime): # functioning. It'll have circuits, but little else. If this is the case then # notify the user and tell them what they can do to fix it. - if conn.getOption("DisableDebuggerAttachment", None) == "1": + if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") connections.getResolver("tor").setPaused(True) else: @@ -542,34 +542,34 @@ def startTorMonitor(startTime): # Configures connection resoultions. This is paused/unpaused according to # if Tor's connected or not. - conn.addStatusListener(connResetListener) + torTools.getConn().addStatusListener(connResetListener) - if torPid: + if tor_pid: # use the tor pid to help narrow connection results - torCmdName = system.get_name_by_pid(torPid) + tor_cmd = system.get_name_by_pid(tor_pid) - if torCmdName is None: - torCmdName = "tor" + if tor_cmd is None: + tor_cmd = "tor" - connections.getResolver(torCmdName, torPid, "tor") + connections.getResolver(tor_cmd, tor_pid, "tor") else: # constructs singleton resolver and, if tor isn't connected, initizes # it to be paused - connections.getResolver("tor").setPaused(not conn.isAlive()) + connections.getResolver("tor").setPaused(not controller.is_alive()) # hack to display a better (arm specific) notice if all resolvers fail connections.RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." # provides a notice about any event types tor supports but arm doesn't - missingEventTypes = arm.logPanel.getMissingEventTypes() + missing_event_types = arm.logPanel.getMissingEventTypes() - if missingEventTypes: - pluralLabel = "s" if len(missingEventTypes) > 1 else "" - log.info("arm doesn't recognize the following event type%s: %s (log 'UNKNOWN' events to see them)" % (pluralLabel, ", ".join(missingEventTypes))) + if missing_event_types: + plural_label = "s" if len(missing_event_types) > 1 else "" + log.info("arm doesn't recognize the following event type%s: %s (log 'UNKNOWN' events to see them)" % (plural_label, ", ".join(missing_event_types))) try: - curses.wrapper(drawTorMonitor, startTime) - except UnboundLocalError, exc: + curses.wrapper(drawTorMonitor, start_time) + except UnboundLocalError as exc: if os.environ['TERM'] != 'xterm': shutdownDaemons() print 'Unknown $TERM: (%s)' % os.environ['TERM'] diff --git a/arm/starter.py b/arm/starter.py index 697e082..93d8ff2 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -379,7 +379,7 @@ def main(): if arm.util.uiTools.isUnicodeAvailable(): locale.setlocale(locale.LC_ALL, "") - arm.controller.startTorMonitor(start_time) + arm.controller.start_arm(start_time) if __name__ == '__main__': main()

1 0

[arm/master] Moving missing pid notice to the starter
by atagar＠torproject.org 17 Sep '13

17 Sep '13

commit c551d65f32e7077fcc01188b6fb2e27341d0e0f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 16 17:35:48 2013 -0700 Moving missing pid notice to the starter I'd like to axe the start_arm() function if able so moving this notification to the starter. --- arm/controller.py | 13 ++++--------- arm/settings.cfg | 1 + arm/starter.py | 8 ++++++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arm/controller.py b/arm/controller.py index 2d5866b..b6b1b9f 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -514,15 +514,6 @@ def start_arm(start_time): :param float start_time: unix timestamp for when arm was started """ - # attempts to fetch the tor pid, warning if unsuccessful (this is needed for - # checking its resource usage, among other things) - - controller = torTools.getConn().controller - tor_pid = controller.get_pid(None) - - if not tor_pid: - log.warn("Unable to determine Tor's pid. Some information, like its resource usage will be unavailable.") - # adds events needed for arm functionality to the torTools REQ_EVENTS # mapping (they're then included with any setControllerEvents call, and log # a more helpful error if unavailable) @@ -534,6 +525,8 @@ def start_arm(start_time): # functioning. It'll have circuits, but little else. If this is the case then # notify the user and tell them what they can do to fix it. + controller = torTools.getConn().controller + if controller.get_conf("DisableDebuggerAttachment", None) == "1": log.notice("Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") connections.getResolver("tor").setPaused(True) @@ -544,6 +537,8 @@ def start_arm(start_time): # if Tor's connected or not. torTools.getConn().addStatusListener(connResetListener) + tor_pid = controller.get_pid(None) + if tor_pid: # use the tor pid to help narrow connection results tor_cmd = system.get_name_by_pid(tor_pid) diff --git a/arm/settings.cfg b/arm/settings.cfg index e9564b4..0d5227c 100644 --- a/arm/settings.cfg +++ b/arm/settings.cfg @@ -60,6 +60,7 @@ msg.tor_is_running_as_root Tor is currently running with root permissions. This msg.arm_is_running_as_root Arm is currently running with root permissions. This isn't a good idea, nor should it be necessary. Try starting arm with "sudo -u {tor_user} arm" instead. msg.config_not_found No armrc loaded, using defaults. You can customize arm by placing a configuration file at {path} (see the armrc.sample for its options). msg.unable_to_read_config Failed to load configuration (using defaults): "{error}" +msg.unable_to_determine_pid Unable to determine Tor's pid. Some information, like its resource usage will be unavailable. # Important tor configuration options (shown by default) config.important BandwidthRate diff --git a/arm/starter.py b/arm/starter.py index 93d8ff2..0e4ca9e 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -46,6 +46,7 @@ CONFIG = stem.util.conf.config_dict("arm", { 'msg.arm_is_running_as_root': '', 'msg.config_not_found': '', 'msg.unable_to_read_config': '', + 'msg.unable_to_determine_pid': '', }) # Our default arguments. The _get_args() function provides a named tuple of @@ -372,6 +373,13 @@ def main(): os.putenv("LANG", "C") + # check that we'll be able to get tor's pid later + + try: + controller.get_pid() + except ValueError: + stem.util.log.warn(CONFIG['msg.unable_to_determine_pid']) + # If using our LANG variable for rendering multi-byte characters lets us # get unicode support then then use it. This needs to be done before # initializing curses.

1 0