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

[tor/release-0.2.4] fold in new changes files
by arma＠torproject.org 15 Jun '13

15 Jun '13

commit 110a75130e319f96ce528ae4e17659d95f9c5e7d Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 14 18:25:03 2013 -0400 fold in new changes files --- ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++------------ changes/bug8639 | 5 ----- changes/bug8822 | 5 ----- changes/bug8965 | 3 --- changes/bug9047 | 6 ------ changes/bug9063 | 3 --- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bf0c3f..333213d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,30 @@ -Changes in version 0.2.4.13-alpha - 2013-06-1? +Changes in version 0.2.4.13-alpha - 2013-06-14 + Tor 0.2.4.13-alpha fixes a variety of potential remote crash + vulnerabilities, makes socks5 username/password circuit isolation + actually actually work (this time for sure!), and cleans up a bunch + of other issues in preparation for a release candidate. + + o Major bugfixes (robustness): + - Close any circuit that has too many cells queued on it. Fixes + bug 9063; bugfix on the 54th commit of Tor. This bug is a further + fix beyond bug 6252, whose fix was merged into 0.2.3.21-rc. + - Prevent the get_freelists() function from running off the end of + the list of freelists if it somehow gets an unrecognized + allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by + eugenis. + - Avoid an assertion failure on OpenBSD (and perhaps other BSDs) + when an exit connection with optimistic data succeeds immediately + rather than returning EINPROGRESS. Fixes bug 9017; bugfix on + 0.2.3.1-alpha. + - Fix a directory authority crash bug when building a consensus + using an older consensus as its basis. Fixes bug 8833. Bugfix + on 0.2.4.12-alpha. o Major bugfixes: - Avoid a memory leak where we would leak a consensus body when we find that a consensus which we couldn't previously verify due to missing certificates is now verifiable. Fixes bug 8719; bugfix on 0.2.0.10-alpha. - - Prevent the get_freelists() function from running off the end of - the list of freelists if it somehow gets an unrecognized - allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by - eugenis. - We used to always request authority certificates by identity digest, meaning we'd get the newest one even when we wanted one with a different signing key. Then we would complain about being given @@ -16,21 +32,22 @@ Changes in version 0.2.4.13-alpha - 2013-06-1? wanted. Now we use the "fp-sk/" resource as well as the "fp/" resource to request the one we want. Fixes bug 5595; bugfix on 0.2.0.8-alpha. - - Avoid an assertion failure on OpenBSD (and perhaps other BSDs) - when an exit connection with optimistic data succeeds immediately - rather than returning EINPROGRESS. Fixes bug 9017; bugfix on - 0.2.3.1-alpha. - Follow the socks5 protocol when offering username/password authentication. The fix for bug 8117 exposed this bug, and it turns out real-world applications like Pidgin do care. Bugfix on 0.2.3.2-alpha; fixes bug 8879. - - Fix a directory authority crash bug when building a consensus - using an older consensus as its basis. Fixes bug 8833. Bugfix - on 0.2.4.12-alpha. + - Prevent failures on Windows Vista and later when rebuilding the + microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822; + bugfix on 0.2.4.12-alpha. o Minor bugfixes: - Fix an impossible buffer overrun in the AES unit tests. Fixes bug 8845; bugfix on 0.2.0.7-alpha. Found by eugenis. + - If for some reason we fail to write a microdescriptor while + rebuilding the cache, do not let the annotations from that + microdescriptor linger in the cache file, and do not let the + microdescriptor stay recorded as present in its old location. + Fixes bug 9047; bugfix on 0.2.2.6-alpha. - Fix a memory leak that would occur whenever a configuration option changed. Fixes bug 8718; bugfix on 0.2.3.3-alpha. - Paste the description for PathBias parameters from the man @@ -39,6 +56,11 @@ Changes in version 0.2.4.13-alpha - 2013-06-1? - Relays now treat a changed IPv6 ORPort as sufficient reason to publish an updated descriptor. Fixes bug 6026; bugfix on 0.2.4.1-alpha. + - When launching a resolve request on behalf of an AF_UNIX control + socket, omit the address field of the new entry connection, used in + subsequent controller events, rather than letting tor_dup_addr() + set it to "<unknown address type>". Fixes bug 8639; bugfix on + 0.2.4.12-alpha. o Minor bugfixes (log messages): - Fix a scaling issue in the path bias accounting code that @@ -60,6 +82,10 @@ Changes in version 0.2.4.13-alpha - 2013-06-1? bandwidth claims. Resolves ticket 8711. - Update to the June 5 2013 Maxmind GeoLite Country database. + o Removed documentation: + - Remove some of the older contents of doc/ as obsolete; move others + to torspec.git. Fixes bug 8965. + o Code simplification and refactoring: - Avoid using character buffers when constructing most directory objects: this approach was unwieldy and error-prone. Instead, diff --git a/changes/bug8639 b/changes/bug8639 deleted file mode 100644 index 0db5c91..0000000 --- a/changes/bug8639 +++ /dev/null @@ -1,5 +0,0 @@ - o Normal bugfixes: - - When launching a resolve request on behalf of an AF_UNIX control - socket, omit the address field of the new entry connection, used in - subsequent controller events, rather than letting tor_dup_addr() set - it to "<unknown address type>". Fixes bug 8639. diff --git a/changes/bug8822 b/changes/bug8822 deleted file mode 100644 index c6787af..0000000 --- a/changes/bug8822 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (windows): - - Prevent failures on Windows Vista and later when rebuilding the - microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822; - bugfix on 0.2.4.12-alpha. - diff --git a/changes/bug8965 b/changes/bug8965 deleted file mode 100644 index b5af279..0000000 --- a/changes/bug8965 +++ /dev/null @@ -1,3 +0,0 @@ - o Removed documentation: - - Remove some of the older contents of doc/ as obsolete; move others - to torspec.git. Fixes bug 8965. diff --git a/changes/bug9047 b/changes/bug9047 deleted file mode 100644 index 497f0d3..0000000 --- a/changes/bug9047 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - If for some reason we fail to write a microdescriptor while - rebuilding the cache, do not let the annotations from that - microdescriptor linger in the cache file, and do not let the - microdescriptor stay recorded as present in its old location. - Fixes bug 9047; bugfix on 0.2.2.6-alpha. diff --git a/changes/bug9063 b/changes/bug9063 deleted file mode 100644 index dcbecf6..0000000 --- a/changes/bug9063 +++ /dev/null @@ -1,3 +0,0 @@ - o Normal bugfixes: - - Close any circuit that has more cells queued than the spec permits. - Fixes bug #9063; bugfix on 0.2.4.12.

1 0

[tor/release-0.2.4] bump to 0.2.4.13-alpha
by arma＠torproject.org 15 Jun '13

15 Jun '13

commit dcb4f22506c7763dee9fbf6139df9dc11d41b184 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 14 18:27:38 2013 -0400 bump to 0.2.4.13-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3fe0482..f7e7f5e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.12-alpha]) +AC_INIT([tor],[0.2.4.13-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index d8d9904..603194a 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.12-alpha" +!define VERSION "0.2.4.13-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e002c8f..508fe36 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.12-alpha" +#define VERSION "0.2.4.13-alpha"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 14 Jun '13

14 Jun '13

commit ab2ec8c81bd40081d3c0093809d9b2802eaeb78a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 14 19:45:18 2013 +0000 Update translations for vidalia --- sl/vidalia_sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl/vidalia_sl.po b/sl/vidalia_sl.po index 9766514..1ab08db 100644 --- a/sl/vidalia_sl.po +++ b/sl/vidalia_sl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-06-14 11:45+0000\n" +"PO-Revision-Date: 2013-06-14 19:35+0000\n" "Last-Translator: Popins <popins30(a)gmail.com>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n" "MIME-Version: 1.0\n"

1 0

[arm/master] Warning rather than attempting to correct TERM
by atagar＠torproject.org 14 Jun '13

14 Jun '13

commit 954f194560e43ac8e4fa588abc041a1d7a98ef31 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 14 09:03:55 2013 -0700 Warning rather than attempting to correct TERM Lunar^ points out that setting the user's TERM could cause issues. Replacing it with a warning... atagar@morrigan:~/Desktop/arm$ TERM=rxvt-unicode-256color arm Unknown $TERM: (rxvt-unicode-256color) Either update your terminfo database or run arm using "TERM=xterm arm". --- arm | 2 -- src/cli/controller.py | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arm b/arm index 040ef4b..0a23aaa 100755 --- a/arm +++ b/arm @@ -9,8 +9,6 @@ else arm_base=$( dirname "$0" )/src/ fi -TERM=xterm # other terms, like rxvt-unicode-256color, can cause curses to fail - python "${arm_base}prereq.py" $* if [ $? = 0 ]; then diff --git a/src/cli/controller.py b/src/cli/controller.py index 58bd41d..0ef07d8 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -6,6 +6,7 @@ user input to the proper panels. import os import time import curses +import sys import threading import cli.menu.menu @@ -444,8 +445,10 @@ def shutdownDaemons(): # stops panel daemons control = getController() - for panelImpl in control.getDaemonPanels(): panelImpl.stop() - for panelImpl in control.getDaemonPanels(): panelImpl.join() + + if control: + for panelImpl in control.getDaemonPanels(): panelImpl.stop() + for panelImpl in control.getDaemonPanels(): panelImpl.join() # joins on stem threads torTools.getConn().close() @@ -562,6 +565,14 @@ def startTorMonitor(startTime): try: curses.wrapper(drawTorMonitor, startTime) + except UnboundLocalError, exc: + if os.environ['TERM'] != 'xterm': + shutdownDaemons() + print 'Unknown $TERM: (%s)' % os.environ['TERM'] + print 'Either update your terminfo database or run arm using "TERM=xterm arm".' + print + else: + raise exc except KeyboardInterrupt: # Skip printing stack trace in case of keyboard interrupt. The # HALT_ACTIVITY attempts to prevent daemons from triggering a curses redraw

1 0

[arm/master] Restricting the TERM to be xterm
by atagar＠torproject.org 14 Jun '13

14 Jun '13

commit b2c2568479105e38ea632e8c9f0525019699005a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 14 08:39:23 2013 -0700 Restricting the TERM to be xterm The curses module evidently can't handle a TERM of rxvt-unicode-256color... atagar@morrigan:~/Desktop/arm$ TERM=rxvt-unicode-256color arm Traceback (most recent call last): File "./src/starter.py", line 464, in <module> cli.controller.startTorMonitor(time.time() - initTime) File "/home/atagar/Desktop/arm/src/cli/controller.py", line 564, in startTorMonitor curses.wrapper(drawTorMonitor, startTime) File "/usr/lib/python2.7/curses/wrapper.py", line 46, in wrapper stdscr.keypad(0) UnboundLocalError: local variable 'stdscr' referenced before assignment Caught by Lunar^ on... https://trac.torproject.org/9064 --- arm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arm b/arm index 0a23aaa..040ef4b 100755 --- a/arm +++ b/arm @@ -9,6 +9,8 @@ else arm_base=$( dirname "$0" )/src/ fi +TERM=xterm # other terms, like rxvt-unicode-256color, can cause curses to fail + python "${arm_base}prereq.py" $* if [ $? = 0 ]; then

1 0

[arm/master] Removing detached startup
by atagar＠torproject.org 14 Jun '13

14 Jun '13

commit dacfc32255522c436f0c5e61fcaf337c3e3ebeea Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 2 20:56:45 2013 -0700 Removing detached startup While adding the setup wizard I added the ability for arm to run without a tor instance to connect to (the reason being, of course, that arm would make that instance). Now that the wizard is gone this is just added complexity. Dropping it. --- armrc.sample | 6 ------ src/starter.py | 28 +++++++--------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/armrc.sample b/armrc.sample index b5aa31b..6c119ca 100644 --- a/armrc.sample +++ b/armrc.sample @@ -66,12 +66,6 @@ features.refreshRate 5 # Confirms promt to confirm when quiting if true features.confirmQuit true -# Allows arm to start when there's no running tor instance if true, otherwise -# we terminate right away. This is ignored if the user provides an option -# specifying how to connect to tor (ie, a 'startup.interface.*' option or -# startup argument). -features.allowDetachedStartup false - # Paremters for the log panel # --------------------------- # showDateDividers diff --git a/src/starter.py b/src/starter.py index 840e914..29e628f 100644 --- a/src/starter.py +++ b/src/starter.py @@ -42,7 +42,6 @@ CONFIG = stem.util.conf.config_dict("arm", { "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", - "features.allowDetachedStartup": False, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, }) @@ -104,7 +103,7 @@ def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't attempt to connect by various methods... - (allowPortConnection, allowSocketConnection, allowDetachedStart) + (allowPortConnection, allowSocketConnection) """ confKeys = stem.util.conf.get_config("arm").keys() @@ -115,12 +114,7 @@ def allowConnectionTypes(): skipPortConnection = isSocketArgPresent and not isPortArgPresent skipSocketConnection = isPortArgPresent and not isSocketArgPresent - # Flag to indicate if we'll start arm reguardless of being unable to connect - # to Tor. - - allowDetachedStart = CONFIG["features.allowDetachedStartup"] and not isPortArgPresent and not isSocketArgPresent - - return (not skipPortConnection, not skipSocketConnection, allowDetachedStart) + return (not skipPortConnection, not skipSocketConnection) def _loadConfigurationDescriptions(pathPrefix): """ @@ -186,7 +180,7 @@ def _loadConfigurationDescriptions(pathPrefix): except IOError, exc: stem.util.log.error(DESC_INTERNAL_LOAD_FAILED_MSG % util.sysTools.getFileErrorMsg(exc)) -def _getController(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, incorrectPasswordMsg="", printError=True): +def _getController(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, incorrectPasswordMsg=""): """ Custom handler for establishing a stem connection (... needs an overhaul). """ @@ -214,7 +208,7 @@ def _getController(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i # again prompting for the user to enter it print incorrectPasswordMsg return _getController(controlAddr, controlPort) - elif printError: + else: print exc return None @@ -352,14 +346,6 @@ if __name__ == '__main__': # no armrc found, falling back to the defaults in the source stem.util.log.notice(STANDARD_CFG_NOT_FOUND_MSG % configPath) - # prevent arm from starting without a tor instance if... - # - we're launching a prompt - # - tor is running (otherwise it would be kinda confusing, "tor is running - # but why does arm say that it's shut down?") - - if len(stem.util.system.get_pid_by_name('tor', multiple = True)) >= 1: - config.set("features.allowDetachedStartup", "false") - # syncs config and parameters, saving changed config options and overwriting # undefined parameters with defaults for key in param.keys(): @@ -390,7 +376,7 @@ if __name__ == '__main__': # arguments for connecting to the other. controller = None - allowPortConnection, allowSocketConnection, allowDetachedStart = allowConnectionTypes() + allowPortConnection, allowSocketConnection = allowConnectionTypes() socketPath = param["startup.interface.socket"] if os.path.exists(socketPath) and allowSocketConnection: @@ -411,7 +397,7 @@ if __name__ == '__main__': # sending problems to stdout if they arise authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath - controller = _getController(controlAddr, controlPort, authPassword, incorrectPasswordMsg, not allowDetachedStart) + controller = _getController(controlAddr, controlPort, authPassword, incorrectPasswordMsg) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this @@ -429,7 +415,7 @@ if __name__ == '__main__': if pwLineNum != None: del config._raw_contents[i] - if controller is None and not allowDetachedStart: sys.exit(1) + if controller is None: sys.exit(1) # initializing the connection may require user input (for the password) # skewing the startup time results so this isn't counted

1 0

[tor/master] Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF.
by nickm＠torproject.org 14 Jun '13

14 Jun '13

commit 7f67becf307e383eeda94dc4a7dbf5629436ef8c Author: dana koch <dsk(a)google.com> Date: Thu Jun 13 22:04:01 2013 +1000 Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF. This lets us have the possibility of fine-tuning the check in the tor_sscanf test cases at a later date. --- src/common/compat.h | 8 +++++++- src/common/util.h | 12 +++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 8ab7190..258fc99 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -84,13 +84,19 @@ /* ===== Compiler compatibility */ -/* GCC can check printf types on arbitrary functions. */ +/* GCC can check printf and scanf types on arbitrary functions. */ #ifdef __GNUC__ #define CHECK_PRINTF(formatIdx, firstArg) \ __attribute__ ((format(printf, formatIdx, firstArg))) #else #define CHECK_PRINTF(formatIdx, firstArg) #endif +#ifdef __GNUC__ +#define CHECK_SCANF(formatIdx, firstArg) \ + __attribute__ ((format(scanf, formatIdx, firstArg))) +#else +#define CHECK_SCANF(formatIdx, firstArg) +#endif /* inline is __inline on windows. */ #ifdef _WIN32 diff --git a/src/common/util.h b/src/common/util.h index 018316e..5596378 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -233,16 +233,10 @@ const char *escaped(const char *string); char *tor_escape_str_for_socks_arg(const char *string); struct smartlist_t; -int tor_vsscanf(const char *buf, const char *pattern, va_list ap) -#ifdef __GNUC__ - __attribute__((format(scanf, 2, 0))) -#endif - ; +int tor_vsscanf(const char *buf, const char *pattern, va_list ap) \ + CHECK_SCANF(2, 0); int tor_sscanf(const char *buf, const char *pattern, ...) -#ifdef __GNUC__ - __attribute__((format(scanf, 2, 3))) -#endif - ; + CHECK_SCANF(2, 3); void smartlist_add_asprintf(struct smartlist_t *sl, const char *pattern, ...) CHECK_PRINTF(2, 3);

1 0

[chutney/master] Print a note about the renaming of old net/nodes directory.
by nickm＠torproject.org 14 Jun '13

14 Jun '13

commit 5dd20682966102bcf3d11bdd8dc9cbeb8e0467be Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jun 5 15:48:57 2013 +0200 Print a note about the renaming of old net/nodes directory. --- tools/bootstrap-network.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 9173776..a686669 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -16,15 +16,20 @@ VOTING_OFFSET=6 CHUTNEY=./chutney +myname=$(basename "$0") -[ -x $CHUTNEY ] || { echo "$0: missing $CHUTNEY"; exit 1; } -[ -d networks ] || { echo "$0: missing directory: networks"; exit 1; } -[ -d net ] || { echo "$0: missing directory: net"; exit 1; } +[ -x $CHUTNEY ] || { echo "$myname: missing $CHUTNEY"; exit 1; } +[ -d networks ] || { echo "$myname: missing directory: networks"; exit 1; } +[ -d net ] || { echo "$myname: missing directory: net"; exit 1; } flavour=basic; [ -n "$1" ] && { flavour=$1; shift; } $CHUTNEY stop networks/$flavour -[ -d net/nodes ] && mv net/nodes net/nodes.$(date +%s) -echo "$0: boostrapping network: $flavour" +[ -d net/nodes ] && { + DEST=net/nodes.$(date +%s) + echo "$myname: NOTE: renaming net/nodes to $DEST" + mv net/nodes $DEST +} +echo "$myname: boostrapping network: $flavour" $CHUTNEY configure networks/$flavour # TODO: Make 'chutney configure' take an optional offset argument and

1 0

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

14 Jun '13

commit 9219a384fada29c997ad69624e1a1c6fc6c3d777 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 14 12:16:39 2013 +0000 Update translations for tor-launcher-properties --- sl/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl/torlauncher.properties b/sl/torlauncher.properties index b827e08..f69d917 100644 --- a/sl/torlauncher.properties +++ b/sl/torlauncher.properties @@ -24,7 +24,7 @@ # torlauncher.connect=Connect # torlauncher.quit=Quit -# torlauncher.quit_win=Exit +torlauncher.quit_win=Izhod torlauncher.done=Končano # torlauncher.forAssistance=For assistance, contact %S

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 14 Jun '13

14 Jun '13

commit 2a69ea0884ecfc79400da7d48fb904c2f5a4e198 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 14 12:16:35 2013 +0000 Update translations for mat-gui --- sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sl.po b/sl.po index 2387a07..93b385e 100644 --- a/sl.po +++ b/sl.po @@ -40,7 +40,7 @@ msgstr "" #: mat-gui:119 mat-gui:214 msgid "Check" -msgstr "" +msgstr "Preveri" #: mat-gui:121 msgid "Check selected files for harmful meta" @@ -100,7 +100,7 @@ msgstr "" #: mat-gui:220 msgid "About" -msgstr "" +msgstr "O programu" #: mat-gui:241 msgid "Choose files"

1 0