- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit 2d25dccaa3cee3fca25cc5f2fc7dce3c48076e9d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 03:45:14 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 8f4f091..a96f11f 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-28 03:10+0000\n" +"PO-Revision-Date: 2012-01-28 03:27+0000\n" "Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -149,7 +149,7 @@ msgstr "Bruk TCP forbindelse (Kontroll Port)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Vei:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -161,7 +161,7 @@ msgstr "Rediger nåværende torrc." msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "Advarsel: dette vil endre den nåværende lastede torcc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -1285,7 +1285,7 @@ msgstr "Ikke gjenoppta" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Kunne ikke starte Vidalia på nytt" msgctxt "CrashReportDialog" msgid "" @@ -2402,11 +2402,11 @@ msgstr "" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor Status" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Avansert" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2703,7 +2703,7 @@ msgstr "Trykk på Hjelp for å se andre metoder for å finne nye broer." msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adresse:" msgctxt "NetworkPage" msgid "Type:" @@ -2711,7 +2711,7 @@ msgstr "" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Du må velge proxy typen" msgctxt "NetworkPage" msgid "SOCKS 4" @@ -2723,11 +2723,11 @@ msgstr "" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3271,15 +3271,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor programmet kjører" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Du anvender deg nå av \"%1\" versjonen av Tor programmet." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor programmet kjører ikke" msgctxt "StatusEventWidget" msgid "" @@ -3287,6 +3287,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor " +"programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, " +"for informasjon om eventuelle feil som oppstod. " msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit dd549104aed5b474e6befe59af1cdb4c6d869846 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 03:15:15 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 9b3db99..8f4f091 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -1,13 +1,14 @@ # # Translators: +# <kmdl(a)hotmail.no>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-28 03:10+0000\n" +"Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -140,11 +141,11 @@ msgstr "Velg mappen der Tor lagrer data" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor kontroll" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Bruk TCP forbindelse (Kontroll Port)" msgctxt "AdvancedPage" msgid "Path:" @@ -156,7 +157,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Rediger nåværende torrc." msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" @@ -177,10 +178,12 @@ msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt " +"system sitt 8-bit karakter kodifikasjon" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Advarsel" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -1266,19 +1269,19 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Send en feilrapport" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia støtte på et problem og måtte lukkes" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Start Vidalia på nytt" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Ikke gjenoppta" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" @@ -1289,6 +1292,7 @@ msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1593,11 +1597,11 @@ msgstr "Ukjent" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Debug" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Informasjon" msgctxt "LogTreeItem" msgid "Notice" @@ -1605,11 +1609,11 @@ msgstr "" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Advarsel" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Feil" msgctxt "LogTreeItem" msgid "Unknown"

1 0

r25356: {website} Update obfsproxy instructions per armadev and asn's comments (in website/trunk: images projects/en)
by Sebastian Hahn 27 Jan '12

27 Jan '12

Author: sebastian Date: 2012-01-27 19:19:40 +0000 (Fri, 27 Jan 2012) New Revision: 25356 Removed: website/trunk/images/obfs-torrc_bridge.png website/trunk/images/obfs-torrc_client.png Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: Update obfsproxy instructions per armadev and asn's comments Patch contributed by Patrick R McDonald <marlowe(a)antagonism.org> Deleted: website/trunk/images/obfs-torrc_bridge.png =================================================================== (Binary files differ) Deleted: website/trunk/images/obfs-torrc_client.png =================================================================== (Binary files differ) Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 16:56:35 UTC (rev 25355) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 19:19:40 UTC (rev 25356) @@ -28,7 +28,7 @@ In a Linux system using the APT package manager you could do: - <tt># apt-get install autotools gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> + <tt># apt-get install autotools-dev gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> @@ -60,9 +60,20 @@ Set up your Tor configuration file: - <img src="$(IMGROOT)/obfs-torrc_client.png" alt="client torrc"></a> + User tor + PIDFile /usr/local/var/run/tor/tor.pid + SocksPort 1999 # what port to open for local application connections + Log notice file /usr/local/var/log/tor/tor.log + DataDirectory /usr/local/var/lib/tor/data + UseBridges 1 + Bridge obfs2 192.0.2.34:34545 + ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Replace 192.0.2.34 with the bridge supporting obfsproxy you + wish to use and 34545 with the port number the bridge uses. + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the @@ -88,7 +99,13 @@ Set up your Tor configuration file: - <img src="$(IMGROOT)/obfs-torrc_bridge.png" alt="bridge torrc"></a> + User tor + PIDFile /usr/local/var/run/tor/tor.pid + ORPort 4367 + Log notice file /usr/local/var/log/tor/tor.log + DataDirectory /usr/local/var/lib/tor/data + BridgeRelay 1 + ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed

1 0

[vidalia/alpha] Fix minor bugs: takeownership wrong condition and string formatting
by chiiph＠torproject.org 27 Jan '12

27 Jan '12

commit 08361bd8ee95fd4270fb9b8a3eaa0f126caef22f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 27 15:49:10 2012 -0300 Fix minor bugs: takeownership wrong condition and string formatting --- src/vidalia/MainWindow.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 89387c0..65e1e3c 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -621,7 +621,7 @@ MainWindow::start() if(settings.autoControlPort()) { QString portconf = QString("%1/port.conf").arg(expDataDirectory); if(!QFile::remove(portconf)) - vWarn(QString("Unable to remove %s, may be it didn't existed.").arg(portconf)); + vWarn(QString("Unable to remove %1, may be it didn't existed.").arg(portconf)); QString control_str = "auto"; QString socks_str = "auto"; @@ -892,7 +892,7 @@ void MainWindow::connected() { authenticate(); - if(!_torControl->isVidaliaRunningTor()) { + if(_torControl->isVidaliaRunningTor()) { QString err; if(!_torControl->takeOwnership(&err)) vWarn(err); @@ -1377,7 +1377,7 @@ MainWindow::tryCookie(const ProtocolInfo &pi) cookie = loadControlCookie(cookieDir); } if(cookie.size() != 32) { - vWarn(QString("Cookie length has to be exactly 32 bytes long. Found %s bytes") + vWarn(QString("Cookie length has to be exactly 32 bytes long. Found %1 bytes") .arg(cookie.size())); return false; }

1 0

[stem/master] Target accidently included with early test output
by atagar＠torproject.org 27 Jan '12

27 Jan '12

commit 55c3fa6e6bfa90e47f116029a08999fe5cc4ac2a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 25 09:54:07 2012 -0800 Target accidently included with early test output When printing errors an earlier change included the target with the errors listed in the footer. This also changed the errors listed earlier when running the tests which was a mistake. --- test/output.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/output.py b/test/output.py index 89a6cc0..7a69fac 100644 --- a/test/output.py +++ b/test/output.py @@ -186,9 +186,9 @@ class ErrorTracker: def _error_tracker(line_type, line_content): if line_type in (LineType.FAIL, LineType.ERROR): if self._category: - line_content = "[%s] %s" % (self._category, line_content) - - self._errors.append(line_content) + self._errors.append("[%s] %s" % (self._category, line_content)) + else: + self._errors.append(line_content) return line_content

1 0

[stem/master] Rewrite of authentication unit tests
by atagar＠torproject.org 27 Jan '12

27 Jan '12

commit 39e9f0cfdf8efd6cd8445e33feaeb9dd4a44d92f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 27 09:24:59 2012 -0800 Rewrite of authentication unit tests The unit tests for stem.connection.authenticate* functions were the first to use the decent style of mocking that was later used as the basis of the mocking module. Using the module to clean up the unit test and making a stab at making the tests less confusing. --- test/mocking.py | 43 +++++++++ test/unit/connection/authentication.py | 152 +++++++++++++++----------------- 2 files changed, 113 insertions(+), 82 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 740bcb7..f6bf98c 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,10 +1,27 @@ """ Helper functions for creating mock objects and monkey patching to help with testing. + +Mocking Functions + no_op - does nothing + return_value - returns a given value + return_true - returns True + return_false - returns False + return_none - returns None + raise_exception - raises an exception when called + +mock - replaces a function with an alternative implementation +revert_mocking - reverts any changes made by the mock function + +get_protocolinfo_response - provides a ProtocolInfoResponse instance """ import inspect import itertools +import StringIO + +import stem.connection +import stem.socket # Once we've mocked a function we can't rely on its __module__ or __name__ # attributes, so instead we associate a unique 'mock_id' attribute that maps @@ -28,6 +45,10 @@ def return_true(): return return_value(True) def return_false(): return return_value(False) def return_none(): return return_value(None) +def raise_exception(exception): + def _raise(*args): raise exception + return _raise + def mock(target, mock_call): """ Mocks the given function, saving the initial implementation so it can be @@ -73,3 +94,25 @@ def revert_mocking(): MOCK_STATE.clear() +def get_protocolinfo_response(**attributes): + """ + Provides a ProtocolInfoResponse, customized with the given attributes. The + base instance is minimal, with its version set to one and everything else + left with the default. + + Arguments: + attributes (dict) - attributes to customize the the + + Returns: + stem.connection.ProtocolInfoResponse instance + """ + + control_message = "250-PROTOCOLINFO 1\r\n250 OK\r\n" + protocolinfo_response = stem.socket.recv_message(StringIO.StringIO(control_message)) + stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) + + for attr in attributes: + protocolinfo_response.__dict__[attr] = attributes[attr] + + return protocolinfo_response + diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index ba56ccd..0b3a60e 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -2,36 +2,11 @@ Unit tests for the stem.connection.authenticate function. """ -import StringIO -import functools import unittest import stem.connection import stem.util.log as log - -# Functors to replace get_protocolinfo and authenticate_*. All of them take any -# number of arguments. -def no_op(): - def _no_op(*args): - pass - - return _no_op - -def raise_exception(exception_type): - if not exception_type: return no_op() - - def _raise(exc_type, *args): - raise exc_type(None) - - return functools.partial(_raise, exception_type) - -def get_protocolinfo(auth_methods): - control_message = "250-PROTOCOLINFO 1\r\n250 OK\r\n" - protocolinfo_response = stem.socket.recv_message(StringIO.StringIO(control_message)) - stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) - protocolinfo_response.auth_methods = auth_methods - protocolinfo_response.cookie_path = "/tmp/blah" - return lambda *args: protocolinfo_response +import test.mocking as mocking def _get_all_auth_method_combinations(): """ @@ -63,25 +38,13 @@ class TestAuthenticate(unittest.TestCase): """ def setUp(self): - # preserves all of the functors we'll need to monkey patch, and make them - # no-ops - - self.original_get_protocolinfo = stem.connection.get_protocolinfo - self.original_authenticate_none = stem.connection.authenticate_none - self.original_authenticate_password = stem.connection.authenticate_password - self.original_authenticate_cookie = stem.connection.authenticate_cookie - - stem.connection.get_protocolinfo = no_op() - stem.connection.authenticate_none = no_op() - stem.connection.authenticate_password = no_op() - stem.connection.authenticate_cookie = no_op() + mocking.mock(stem.connection.get_protocolinfo, mocking.no_op()) + mocking.mock(stem.connection.authenticate_none, mocking.no_op()) + mocking.mock(stem.connection.authenticate_password, mocking.no_op()) + mocking.mock(stem.connection.authenticate_cookie, mocking.no_op()) def tearDown(self): - # restore functions - stem.connection.get_protocolinfo = self.original_get_protocolinfo - stem.connection.authenticate_none = self.original_authenticate_none - stem.connection.authenticate_password = self.original_authenticate_password - stem.connection.authenticate_cookie = self.original_authenticate_cookie + mocking.revert_mocking() def test_with_get_protocolinfo(self): """ @@ -89,15 +52,20 @@ class TestAuthenticate(unittest.TestCase): """ # tests where get_protocolinfo succeeds - stem.connection.get_protocolinfo = get_protocolinfo((stem.connection.AuthMethod.NONE, )) + protocolinfo_response = mocking.get_protocolinfo_response( + auth_methods = (stem.connection.AuthMethod.NONE, ), + ) + + mocking.mock(stem.connection.get_protocolinfo, mocking.return_value(protocolinfo_response)) stem.connection.authenticate(None) - # tests where get_protocolinfo raises a ProtocolError - stem.connection.get_protocolinfo = raise_exception(stem.socket.ProtocolError) + # tests where get_protocolinfo raises an exception + raised_exc = stem.socket.ProtocolError(None) + mocking.mock(stem.connection.get_protocolinfo, mocking.raise_exception(raised_exc)) self.assertRaises(stem.connection.IncorrectSocketType, stem.connection.authenticate, None) - # tests where get_protocolinfo raises a SocketError - stem.connection.get_protocolinfo = raise_exception(stem.socket.SocketError) + raised_exc = stem.socket.SocketError(None) + mocking.mock(stem.connection.get_protocolinfo, mocking.raise_exception(raised_exc)) self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None) def test_all_use_cases(self): @@ -113,50 +81,70 @@ class TestAuthenticate(unittest.TestCase): stem_logger.setLevel(log.logging_level(None)) # exceptions that the authentication functions are documented to raise - auth_none_exc_types = (None, - stem.connection.OpenAuthRejected) + all_auth_none_exc = (None, + stem.connection.OpenAuthRejected(None)) + + all_auth_password_exc = (None, + stem.connection.PasswordAuthRejected(None), + stem.connection.IncorrectPassword(None)) - auth_password_exc_types = (None, - stem.connection.PasswordAuthRejected, - stem.connection.IncorrectPassword) + all_auth_cookie_exc = (None, + stem.connection.IncorrectCookieSize(None), + stem.connection.UnreadableCookieFile(None), + stem.connection.CookieAuthRejected(None), + stem.connection.IncorrectCookieValue(None)) - auth_cookie_exc_types = (None, - stem.connection.IncorrectCookieSize, - stem.connection.UnreadableCookieFile, - stem.connection.CookieAuthRejected, - stem.connection.IncorrectCookieValue) + # authentication functions might raise a controller error when + # 'suppress_ctl_errors' is False, so including those - # auth functions don't suppress controller exceptions - control_exc_types = ( - stem.socket.ProtocolError, - stem.socket.SocketError, - stem.socket.SocketClosed) + control_exc = ( + stem.socket.ProtocolError(None), + stem.socket.SocketError(None), + stem.socket.SocketClosed(None)) - for auth_methods in _get_all_auth_method_combinations(): - protocolinfo_input = get_protocolinfo(auth_methods)() + all_auth_none_exc += control_exc + all_auth_password_exc += control_exc + all_auth_cookie_exc += control_exc + + for protocolinfo_auth_methods in _get_all_auth_method_combinations(): + # protocolinfo input for the authenticate() call we'll be making + protocolinfo_arg = mocking.get_protocolinfo_response( + auth_methods = protocolinfo_auth_methods, + cookie_path = "/tmp/blah", + ) - for auth_none_exc in auth_none_exc_types + control_exc_types: - for auth_password_exc in auth_password_exc_types + control_exc_types: - for auth_cookie_exc in auth_cookie_exc_types + control_exc_types: - stem.connection.authenticate_none = raise_exception(auth_none_exc) - stem.connection.authenticate_password = raise_exception(auth_password_exc) - stem.connection.authenticate_cookie = raise_exception(auth_cookie_exc) - - auth_tuple_set = ( - (stem.connection.AuthMethod.NONE, auth_none_exc), - (stem.connection.AuthMethod.PASSWORD, auth_password_exc), - (stem.connection.AuthMethod.COOKIE, auth_cookie_exc)) + for auth_none_exc in all_auth_none_exc: + for auth_password_exc in all_auth_password_exc: + for auth_cookie_exc in all_auth_cookie_exc: + # determine if the authenticate() call will succeed and mock each + # of the authenticate_* function to raise its given exception expect_success = False - for auth_type, auth_exc in auth_tuple_set: - if auth_type in auth_methods and not auth_exc: - expect_success = True - break + auth_mocks = { + stem.connection.AuthMethod.NONE: + (stem.connection.authenticate_none, auth_none_exc), + stem.connection.AuthMethod.PASSWORD: + (stem.connection.authenticate_password, auth_password_exc), + stem.connection.AuthMethod.COOKIE: + (stem.connection.authenticate_cookie, auth_cookie_exc), + } + + for auth_method in auth_mocks: + auth_function, raised_exc = auth_mocks[auth_method] + + if not raised_exc: + # Mocking this authentication method so it will succeed. If + # it's among the protocolinfo methods then expect success. + + mocking.mock(auth_function, mocking.no_op()) + expect_success |= auth_method in protocolinfo_auth_methods + else: + mocking.mock(auth_function, mocking.raise_exception(raised_exc)) if expect_success: - stem.connection.authenticate(None, "blah", protocolinfo_input) + stem.connection.authenticate(None, "blah", protocolinfo_arg) else: - self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None, "blah", protocolinfo_input) + self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None, "blah", protocolinfo_arg) # revert logging back to normal stem_logger.setLevel(log.logging_level(log.TRACE))

1 0

r25355: {website} close the orbot tag. (website/trunk/include)
by Andrew Lewman 27 Jan '12

27 Jan '12

Author: phobos Date: 2012-01-27 16:56:35 +0000 (Fri, 27 Jan 2012) New Revision: 25355 Modified: website/trunk/include/versions.wmi Log: close the orbot tag. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-27 16:53:36 UTC (rev 25354) +++ website/trunk/include/versions.wmi 2012-01-27 16:56:35 UTC (rev 25355) @@ -58,7 +58,7 @@ <define-tag version-androidbundle-orbot whitespace=delete>1.0.7-FINAL</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-android-bundle-tor>-orbot-<version-androidbundle-orbot>.apk +<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-android-bundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag>

1 0

r25354: {website} orbot 1.0.7 released. (website/trunk/include)
by Andrew Lewman 27 Jan '12

27 Jan '12

Author: phobos Date: 2012-01-27 16:53:36 +0000 (Fri, 27 Jan 2012) New Revision: 25354 Modified: website/trunk/include/versions.wmi Log: orbot 1.0.7 released. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-01-26 21:01:33 UTC (rev 25353) +++ website/trunk/include/versions.wmi 2012-01-27 16:53:36 UTC (rev 25354) @@ -54,11 +54,11 @@ <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag> -<define-tag version-androidbundle-tor whitespace=delete>0.2.3.7-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.6-</define-tag> +<define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> +<define-tag version-androidbundle-orbot whitespace=delete>1.0.7-FINAL</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/Orbot-<version-androidbundle-orbot>-Tor-<version-androidbundle-tor>-FINAL.apk</define-tag> +<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-android-bundle-tor>-orbot-<version-androidbundle-orbot>.apk <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32-1.exe</define-tag> <define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag>

1 0

[tor/master] Use dead_strip to reduce binary size on OS X
by nickm＠torproject.org 27 Jan '12

27 Jan '12

commit 1f5c5624f48b078e8c421874bf0015e84bda57f7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jan 20 23:13:35 2012 +0100 Use dead_strip to reduce binary size on OS X This option seems to be supported all the way back to at least 10.4, so enabling it for OS X in general should be fine. If not, someone will yell. With no libs statically linked, that's a 3% win in binary size, with just libevent linked statically, this gives us an advantage of 5% in terms of binary size, and with libevent and openssl statically linked, we gain over 18% or over 500KB. Implements ticket 2915. --- changes/osx_deadstrip | 5 +++++ configure.in | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/osx_deadstrip b/changes/osx_deadstrip new file mode 100644 index 0000000..f16eca4 --- /dev/null +++ b/changes/osx_deadstrip @@ -0,0 +1,5 @@ + o Minor features: + - Use the dead_strip option when building Tor on OS X. This reduces binary + size by almost 19% when linking openssl and libevent statically, which + we do for TBB. + diff --git a/configure.in b/configure.in index f4a8e1e..de726c7 100644 --- a/configure.in +++ b/configure.in @@ -1160,12 +1160,13 @@ else fi # OS X Lion started deprecating the system openssl. Let's just disable -# all deprecation warnings on OS X. +# all deprecation warnings on OS X. Also, to potentially make the binary +# a little smaller, let's enable dead_strip. case "$host_os" in darwin*) CFLAGS="$CFLAGS -Wno-deprecated-declarations" - ;; + LDFLAGS="$LDFLAGS -dead_strip" ;; esac # Add some more warnings which we use in development but not in the

1 0

[tor/master] Merge remote-tracking branch 'sebastian/osx_deadstrip'
by nickm＠torproject.org 27 Jan '12

27 Jan '12

commit 2b29c8f48f5c4b9b172e5975adba61a72a275a7a Merge: 247a213 1f5c562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 27 11:49:34 2012 -0500 Merge remote-tracking branch 'sebastian/osx_deadstrip' changes/osx_deadstrip | 5 +++++ configure.in | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0