March 2012 - tor-commits - lists.torproject.org

[tor/master] Remove tsocks support from torify.
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit 5cd707dcd31201b0ec86769a22605a647bd8a6a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:43:18 2012 -0400 Remove tsocks support from torify. Fixes bug3530 and bug 5180. Patch by ugh. --- contrib/torify.in | 91 ++++++++++++++++++----------------------------------- 1 files changed, 31 insertions(+), 60 deletions(-) diff --git a/contrib/torify.in b/contrib/torify.in index d430da8..a5e1474 100755 --- a/contrib/torify.in +++ b/contrib/torify.in @@ -1,71 +1,42 @@ #! /bin/sh -# Wrapper script for use of the tsocks(8) transparent socksification library -# See the tsocks(1) and torify(1) manpages. - +# This script used to call (the now deprecated) tsocks as a fallback in case +# torsocks wasn't installed. +# Now, it's just a backwards compatible shim around torsocks with reasonable +# behavior if -v/--verbose or -h/--help arguments are passed. +# # Copyright (c) 2004, 2006, 2009 Peter Palfrader # Modified by Jacob Appelbaum <jacob(a)appelbaum.net> April 16th 2006 +# Stripped of all the tsocks cruft by ugh on February 22nd 2012 # May be distributed under the same terms as Tor itself -# taken from Debian's Developer's Reference, 6.4 -pathfind() { - OLDIFS="$IFS" - IFS=: - for p in $PATH; do - if [ -x "$p/$*" ]; then - IFS="$OLDIFS" - return 0 - fi - done - IFS="$OLDIFS" - return 1 -} -# Check for any argument list -if [ "$#" = 0 ]; then - echo "Usage: $0 [-hv] <command> [<options>...]" >&2 - exit 1 -fi +compat() { + echo "torify is now just a wrapper around torsocks(1) for backwards compatibility." +} -if [ "$#" = 1 ] && ( [ "$1" = "-h" ] || [ "$1" = "--help" ] ); then +usage() { + compat echo "Usage: $0 [-hv] <command> [<options>...]" - exit 0 -fi - -if [ "$1" = "-v" ] || [ "$1" = "--verbose" ]; then - verbose=1 - shift 1 -else - verbose=0 -fi - -if pathfind torsocks; then - ! [ "$verbose" -ge 1 ] || echo "Using torsocks as socksifier." >&2 - - exec torsocks "$@" - echo "$0: Failed to exec torsocks $@" >&2 - exit 1 - -elif pathfind tsocks; then - ! [ "$verbose" -ge 1 ] || echo "Using tsocks as socksifier." >&2 - - # Define our tsocks config file - TSOCKS_CONF_FILE="/etc/tor/tor-tsocks.conf" - export TSOCKS_CONF_FILE - - # Check that we've got a tsocks config file - if [ -r "$TSOCKS_CONF_FILE" ] - then - echo "WARNING: tsocks is known to leak DNS and UDP data. If you had torsocks we would use that." >&2 - exec tsocks "$@" - echo "$0: Failed to exec tsocks $@" >&2 - exit 1 - else - echo "$0: Missing tsocks configuration file \"$TSOCKS_CONF_FILE\"." >&2 - exit 1 - fi +} -else - echo "$0: Can't find either tsocks or torsocks in your PATH. Perhaps you haven't installed either?" >&2 +case $# in 0) + usage >&2 exit 1 -fi +esac + +case $# in 1) + case $1 in -h|--help) + usage + exit 0 + esac +esac + +case $1 in -v|--verbose) + compat >&2 + shift +esac + +exec torsocks "$@" +echo "$0: Failed to exec torsocks $@" >&2 +exit 1

1 0

[tor/master] Changelog for torify changes
by nickm＠torproject.org 28 Mar '12

28 Mar '12

commit fc35674567b005f1d096488fc92d81f662aaebe5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:46:47 2012 -0400 Changelog for torify changes Also reinstate the part of the torify script that checks for torsocks being installed, so that we can give a more useful message in case it isn't. --- changes/bug5180 | 7 +++++++ contrib/torify.in | 25 ++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/changes/bug5180 b/changes/bug5180 new file mode 100644 index 0000000..86698b4 --- /dev/null +++ b/changes/bug5180 @@ -0,0 +1,7 @@ + o Removed features: + + - The "torify" script no longer supports the "tsocks" sockifier + tool, since it doesn't support DNS and UDP right for Tor. + Everyone should be using torsocks instead. Fixes bug 3530 and bug + 5180. Based on a patch by "ugh". + diff --git a/contrib/torify.in b/contrib/torify.in index a5e1474..54acfed 100755 --- a/contrib/torify.in +++ b/contrib/torify.in @@ -37,6 +37,25 @@ case $1 in -v|--verbose) shift esac -exec torsocks "$@" -echo "$0: Failed to exec torsocks $@" >&2 -exit 1 +# taken from Debian's Developer's Reference, 6.4 +pathfind() { + OLDIFS="$IFS" + IFS=: + for p in $PATH; do + if [ -x "$p/$*" ]; then + IFS="$OLDIFS" + return 0 + fi + done + IFS="$OLDIFS" + return 1 +} + +if pathfind torsocks; then + exec torsocks "$@" + echo "$0: Failed to exec torsocks $@" >&2 + exit 1 +else + echo "$0: torsocks not found in your PATH. Perhaps it isn't installed? (tsocks is no longer supported, for security reasons.)" >&2 +fi +

1 0

r25581: {website} accurately point to the latest vidalia alpha. also, remove t (website/trunk/projects/en)
by Roger Dingledine 27 Mar '12

27 Mar '12

Author: arma Date: 2012-03-27 23:08:04 +0000 (Tue, 27 Mar 2012) New Revision: 25581 Modified: website/trunk/projects/en/vidalia.wml Log: accurately point to the latest vidalia alpha. also, remove the obsolete "technology previews". Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2012-03-27 23:07:33 UTC (rev 25580) +++ website/trunk/projects/en/vidalia.wml 2012-03-27 23:08:04 UTC (rev 25581) @@ -52,32 +52,20 @@ themselves. + The most recent stable release is <version-vidalia-stable>, + and the most recent alpha release is <version-vidalia-alpha>. <ul> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a> </li> <li> - <a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz">Source Tarball</a> + <a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz">Stable Source Tarball</a> (<a href="../dist/vidalia/vidalia-<version-vidalia-stable>.tar.gz.asc">sig</a>) </li> - </ul> - - <h4>Alpha Releases</h4> - The most recent alpha release is: 0.3.0 - WARNING these are very alpha bundles. - <ul> <li> - <a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">Windows Installer</a> - (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">sig</a>) + <a href="../dist/vidalia/vidalia-<version-vidalia-alpha>.tar.gz">Alpha Source Tarball</a> + (<a href="../dist/vidalia/vidalia-<version-vidalia-alpha>.tar.gz.asc">sig</a>) </li> - <li> - <a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">Mac OS X x86 Only</a> - (<a href="https://archive.torproject.org/tor-package-archive/technology-preview/vidal…">sig</a>) - </li> - <li> - <a href="../dist/vidalia/vidalia-0.3.0-alpha.tar.gz">Source Tarball</a> - (<a href="../dist/vidalia/vidalia-0.3.0-alpha.tar.gz.asc">sig</a>) - </li> </ul> <a id="Contribute"></a>

1 0

r25580: {website} add a tag for the latest vidalia alpha version (website/trunk/include)
by Roger Dingledine 27 Mar '12

27 Mar '12

Author: arma Date: 2012-03-27 23:07:33 +0000 (Tue, 27 Mar 2012) New Revision: 25580 Modified: website/trunk/include/versions.wmi Log: add a tag for the latest vidalia alpha version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-03-27 18:54:54 UTC (rev 25579) +++ website/trunk/include/versions.wmi 2012-03-27 23:07:33 UTC (rev 25580) @@ -57,6 +57,7 @@ <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.17</define-tag> +<define-tag version-vidalia-alpha whitespace=delete>0.3.1</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>

1 0

[tor/master] Log statement to help track down bug4091
by nickm＠torproject.org 27 Mar '12

27 Mar '12

commit 80b2756b537204ba070f1e3df4e5ed3f4e6815c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:28:39 2012 -0400 Log statement to help track down bug4091 --- changes/bug4091_debugging | 5 +++++ src/common/address.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug4091_debugging b/changes/bug4091_debugging new file mode 100644 index 0000000..f785380 --- /dev/null +++ b/changes/bug4091_debugging @@ -0,0 +1,5 @@ + o Minor features: + - Add more information to a log statement that might help track down + bug 4091. If you're seeing "Bug: tor_addr_is_internal() called with a + non-IP address" messages (or any Bug messages, for that matter!), + please let us know about it. diff --git a/src/common/address.c b/src/common/address.c index 17cda42..676c485 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -355,7 +355,9 @@ tor_addr_is_internal(const tor_addr_t *addr, int for_listening) /* unknown address family... assume it's not safe for external use */ /* rather than tor_assert(0) */ - log_warn(LD_BUG, "tor_addr_is_internal() called with a non-IP address."); + log_warn(LD_BUG, "tor_addr_is_internal() called with a non-IP address of " + "type %d", (int)v_family); + tor_fragile_assert(); return 1; }

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Mar '12

27 Mar '12

commit 6628cb7edb80f7154ace224d557a6bc17a08525d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 22:15:30 2012 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 65f0620..02ec7d3 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -27,7 +27,7 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "Om ondersteuning voor andere websites toe te voegen, kunt u"> <!ENTITY https-everywhere.prefs.here_link "zelf regelsets opstellen"> <!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> +<!ENTITY https-everywhere.prefs.reset_default "Standaard herstellen"> <!ENTITY https-everywhere.prefs.view_xml_source "Bekijk XML broncode"> <!ENTITY https-everywhere.source.downloading "Bezig met downloaden">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Mar '12

27 Mar '12

commit f761a83f70b0fb81a4b1e1af078fabfcfe38136c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 22:15:28 2012 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 65f0620..02ec7d3 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -27,7 +27,7 @@ <!ENTITY https-everywhere.prefs.ruleset_howto "Om ondersteuning voor andere websites toe te voegen, kunt u"> <!ENTITY https-everywhere.prefs.here_link "zelf regelsets opstellen"> <!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> +<!ENTITY https-everywhere.prefs.reset_default "Standaard herstellen"> <!ENTITY https-everywhere.prefs.view_xml_source "Bekijk XML broncode"> <!ENTITY https-everywhere.source.downloading "Bezig met downloaden">

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 27 Mar '12

27 Mar '12

commit 75d95fd4099d0f3c68cc6d5a5b65890c7d21ea49 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 22:15:11 2012 +0000 Update translations for vidalia_alpha --- nl/vidalia_nl.po | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nl/vidalia_nl.po b/nl/vidalia_nl.po index 765a3e0..0f524db 100644 --- a/nl/vidalia_nl.po +++ b/nl/vidalia_nl.po @@ -8,7 +8,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:46+0000\n" -"PO-Revision-Date: 2012-03-27 21:42+0000\n" +"PO-Revision-Date: 2012-03-27 22:06+0000\n" "Last-Translator: acorsetmaker <commonsensible(a)hush.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "Cookie" msgctxt "AdvancedPage" msgid "Password" -msgstr "paswoord" +msgstr "Paswoord" msgctxt "AdvancedPage" msgid "Randomly Generate" @@ -212,7 +212,7 @@ msgstr "Paniek" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "WAARSCHUWING: De paniekknop wist het programma bij indrukken" +msgstr "WAARSCHUWING: De paniekknop wist het programma bij indrukken." msgctxt "AdvancedPage" msgid "Enable panic button" @@ -220,7 +220,7 @@ msgstr "Paniekknop activeren" msgctxt "AdvancedPage" msgid "Panic path:" -msgstr "" +msgstr "Paniek pad:" msgctxt "AdvancedPage" msgid "" @@ -1379,7 +1379,7 @@ msgstr "" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "Uitzonderingen" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2010,25 +2010,25 @@ msgstr "" msgctxt "MainWindow" msgid "Panic is enabled" -msgstr "" +msgstr "Paniek is geactiveerd" msgctxt "MainWindow" msgid "" "WARNING: The Panic button is enabled. Use it carefully because it " "will remove Tor completely." -msgstr "" +msgstr "WAARSCHUWING: De paniekknop is geactiveerd. Voorzichtig bij gebruik, zal Tor volledig wissen." msgctxt "MainWindow" msgid "New Circuit" -msgstr "" +msgstr "Nieuw Circuit" msgctxt "MainWindow" msgid "Debug output" -msgstr "" +msgstr "Debug output" msgctxt "MainWindow" msgid "Panic!" -msgstr "" +msgstr "Paniek!" msgctxt "MainWindow" msgid "Reattach tabs" @@ -2036,17 +2036,17 @@ msgstr "" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "Plugins" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "Uw klok staat verkeerd" msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "Uw computerklok staat verkeerd, mogelijk werkt Tor niet als verwacht. Controleer het Berichten Logboek voor meer informatie." msgctxt "MainWindow" msgid "" @@ -2075,7 +2075,7 @@ msgid "" "Vidalia detected that the Tor software exited unexpectedly.\n" "\n" "Please check the message log for recent warning or error messages." -msgstr "Vidalia ontdekte dat de Tor software onverwacht stopte.\n\nControleert u alstublieft de berichtenlog voor recente waarschuwingen of foutmeldingen." +msgstr "Vidalia ontdekte dat de Tor software onverwacht stopte.\n\nControleert u alstublieft het Berichten Logboek voor recente waarschuwingen of foutmeldingen." msgctxt "MainWindow" msgid "failed (%1)" @@ -2083,11 +2083,11 @@ msgstr "mislukt (%1)" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(waarschijnlijk Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(waarschijnlijk een e-mailclient)" msgctxt "MainWindow" msgid "" @@ -2331,11 +2331,11 @@ msgstr "Debug" msgctxt "MessageLog" msgid "Message Log History" -msgstr "Berichten Log Geschiedenis" +msgstr "Berichten Logboek Geschiedenis" msgctxt "MessageLog" msgid "Number of messages to display in the message log window" -msgstr "Aantal berichten dat tegelijk wordt weergeven in berichtenlog scherm" +msgstr "Aantal berichten dat tegelijk wordt weergeven in berichten logboek scherm" msgctxt "MessageLog" msgid "messages" @@ -3210,15 +3210,15 @@ msgstr "E-mailadres waarop u kan worden bereikt als er een probleem is met uw se msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "dag" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "week" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "maand" msgctxt "ServerPage" msgid "Enable accounting" @@ -3262,7 +3262,7 @@ msgstr "" msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "tijd" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3515,7 +3515,7 @@ msgstr "Status" msgctxt "StatusTab" msgid "Message Log" -msgstr "Berichtenlog" +msgstr "Berichten Logboek" msgctxt "StatusTab" msgid "Tor Status"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 27 Mar '12

27 Mar '12

commit 5e507f33b0dd0218a7af82e44733a1ee82e896dd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 27 21:45:19 2012 +0000 Update translations for vidalia_alpha --- nl/vidalia_nl.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nl/vidalia_nl.po b/nl/vidalia_nl.po index 0048a84..765a3e0 100644 --- a/nl/vidalia_nl.po +++ b/nl/vidalia_nl.po @@ -1,5 +1,6 @@ # # Translators: +# <commonsensible(a)hush.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # Shondoit Walker <shondoit+transifex(a)gmail.com>, 2011. msgid "" @@ -7,8 +8,8 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" -"Last-Translator: Shondoit Walker <shondoit+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2012-03-27 21:42+0000\n" +"Last-Translator: acorsetmaker <commonsensible(a)hush.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,16 +207,16 @@ msgstr "" msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "Paniek" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "" +msgstr "WAARSCHUWING: De paniekknop wist het programma bij indrukken" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "Paniekknop activeren" msgctxt "AdvancedPage" msgid "Panic path:"

1 0

r25579: {website} remove whitespace from the qrcode, put the qrcode back in th (in website/trunk: images press/en)
by Andrew Lewman 27 Mar '12

27 Mar '12

Author: phobos Date: 2012-03-27 18:54:54 +0000 (Tue, 27 Mar 2012) New Revision: 25579 Modified: website/trunk/images/contact-info.png website/trunk/press/en/info.wmi Log: remove whitespace from the qrcode, put the qrcode back in the div. Modified: website/trunk/images/contact-info.png =================================================================== (Binary files differ) Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2012-03-27 18:50:02 UTC (rev 25578) +++ website/trunk/press/en/info.wmi 2012-03-27 18:54:54 UTC (rev 25579) @@ -12,8 +12,8 @@ Our contact information as a qrcode: + <img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact info"> </div> - <img src="$(IMGROOT)/contact-info.png" alt="qrcode of contact info">  </div>

1 0