- tor-commits - lists.torproject.org

[tor/master] Warn and ignore the MyFamily setting if BridgeRelay is also set
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 281a5e4670bfd4d687f58cf9999666a4d097e35e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 24 12:39:26 2012 -0400 Warn and ignore the MyFamily setting if BridgeRelay is also set Roger explains at http://archives.seul.org/tor/talk/Nov-2011/msg00209.html : "If you list your bridge as part of your family in the relay descriptor, then everybody can learn your bridge fingerprint, and they can look up your bridge's descriptor (and thus location) at the bridge directory authority." Now, we can't stop relays from listing bridges, but we can warn when we notice a bridge listing anybody, which might help some. This fixes bug 4657; it's a fix on 0.2.0.3-alpha, where bridges were first introduced. --- changes/bug4657 | 4 ++++ src/or/config.c | 6 ++++++ src/or/router.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/changes/bug4657 b/changes/bug4657 new file mode 100644 index 0000000..4d9dd7d --- /dev/null +++ b/changes/bug4657 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - If the configuration tries to set MyFamily on a bridge, refuse to + do so, and warn about the security implications. Fix for bug 4657; + bugfix on 0.2.0.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 090aba1..58c76b4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3601,6 +3601,12 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseEntryGuards && ! options->NumEntryGuards) REJECT("Cannot enable UseEntryGuards with NumEntryGuards set to 0"); + if (options->MyFamily && options->BridgeRelay) { + log_warn(LD_CONFIG, "Listing a family for a bridge relay is not " + "supported: it can reveal bridge fingerprints to censors. " + "You should also make sure you aren't listing this bridge's " + "fingerprint in any other MyFamily."); + } if (check_nickname_list(options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { diff --git a/src/or/router.c b/src/or/router.c index 365e888..1919448 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1483,7 +1483,7 @@ router_rebuild_descriptor(int force) } if (authdir_mode(options)) ri->is_valid = ri->is_named = 1; /* believe in yourself */ - if (options->MyFamily) { + if (options->MyFamily && ! options->BridgeRelay) { smartlist_t *family; if (!warned_nonexistent_family) warned_nonexistent_family = smartlist_create();

1 0

[tor/master] Merge remote-tracking branch 'public/bug4657'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 1ce0c5eba93d2ac48609efc327e6dc1d3a8de981 Merge: c19a2ff 281a5e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:20:44 2012 -0400 Merge remote-tracking branch 'public/bug4657' Conflicts: src/or/router.c changes/bug4657 | 4 ++++ src/or/config.c | 6 ++++++ src/or/router.c | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diff --cc src/or/router.c index b98bb39,1919448..352c456 --- a/src/or/router.c +++ b/src/or/router.c @@@ -1592,26 -1476,28 +1592,26 @@@ router_rebuild_descriptor(int force ri->policy_is_reject_star = policy_is_reject_star(ri->exit_policy); - if (desc_routerinfo) { /* inherit values */ - ri->is_valid = desc_routerinfo->is_valid; - ri->is_running = desc_routerinfo->is_running; - ri->is_named = desc_routerinfo->is_named; - } +#if 0 + /* XXXX NM NM I belive this is safe to remove */ if (authdir_mode(options)) ri->is_valid = ri->is_named = 1; /* believe in yourself */ +#endif + - if (options->MyFamily) { + if (options->MyFamily && ! options->BridgeRelay) { smartlist_t *family; if (!warned_nonexistent_family) - warned_nonexistent_family = smartlist_create(); - family = smartlist_create(); - ri->declared_family = smartlist_create(); + warned_nonexistent_family = smartlist_new(); + family = smartlist_new(); + ri->declared_family = smartlist_new(); smartlist_split_string(family, options->MyFamily, ",", SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); - SMARTLIST_FOREACH(family, char *, name, - { - routerinfo_t *member; + SMARTLIST_FOREACH_BEGIN(family, char *, name) { + const node_t *member; if (!strcasecmp(name, options->Nickname)) - member = ri; + goto skip; /* Don't list ourself, that's redundant */ else - member = router_get_by_nickname(name, 1); + member = node_get_by_nickname(name, 1); if (!member) { int is_legal = is_legal_nickname_or_hexdigest(name); if (!smartlist_string_isin(warned_nonexistent_family, name) &&

1 0

[tor/master] Merge remote-tracking branch 'public/bug4710'
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit c19a2ff6913111d69f2b541194ae188dc354fc54 Merge: 20d6f78 2b6e91c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 10:16:28 2012 -0400 Merge remote-tracking branch 'public/bug4710' changes/bug4710 | 5 +++++ src/or/reasons.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)

1 0

[tor/master] Report EADDRNOTAVAIL and EADDRINUSE as RESOURCELIMIT
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 2b6e91c2ee4f89c0ee31c83c3a5e5414fd2b3d40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:31:45 2012 -0400 Report EADDRNOTAVAIL and EADDRINUSE as RESOURCELIMIT These errors usually mean address exhaustion; reporting them as such lets clients adjust their load to try other exits. Fix for bug 4710; bugfix on 0.1.0.1-rc, which started using END_STREAM_REASON_RESOURCELIMIT. --- changes/bug4710 | 5 +++++ src/or/reasons.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4710 b/changes/bug4710 new file mode 100644 index 0000000..7f94b4d --- /dev/null +++ b/changes/bug4710 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Exit nodes now correcly report EADDRINUSE and EADDRNOTAVAIL as + resource exhaustion, so that clients can adjust their load to + try other exits. Fix for bug 4710; bugfix on 0.1.0.1-rc, which + started using END_STREAM_REASON_RESOURCELIMIT. diff --git a/src/or/reasons.c b/src/or/reasons.c index 319e6c0..67abc35 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -184,6 +184,8 @@ errno_to_stream_end_reason(int e) S_CASE(ENOBUFS): case ENOMEM: case ENFILE: + S_CASE(EADDRINUSE): + S_CASE(EADDRNOTAVAIL): E_CASE(EMFILE): return END_STREAM_REASON_RESOURCELIMIT; default:

1 0

r25672: {website} fix another broken link on the download page, this time wher (website/trunk/download/en)
by Roger Dingledine 05 Jun '12

05 Jun '12

Author: arma Date: 2012-06-05 13:43:49 +0000 (Tue, 05 Jun 2012) New Revision: 25672 Modified: website/trunk/download/en/download.wml Log: fix another broken link on the download page, this time where we had patched the wml directly, rather than our versions file. :/ Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-06-05 13:41:53 UTC (rev 25671) +++ website/trunk/download/en/download.wml 2012-06-05 13:43:49 UTC (rev 25672) @@ -115,9 +115,9 @@  <div class="package"> <div class="downloads"> - <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32-1.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> + <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> <div class="sig"> - (<a href="../dist/win32/tor-<version-win32-stable>-win32-1.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) </div>

1 0

r25671: {website} unless i am mistaken, we never use these three tags. even th (website/trunk/include)
by Roger Dingledine 05 Jun '12

05 Jun '12

Author: arma Date: 2012-06-05 13:41:53 +0000 (Tue, 05 Jun 2012) New Revision: 25671 Modified: website/trunk/include/versions.wmi Log: unless i am mistaken, we never use these three tags. even though we've been updating them. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-05 13:35:27 UTC (rev 25670) +++ website/trunk/include/versions.wmi 2012-06-05 13:41:53 UTC (rev 25671) @@ -7,10 +7,6 @@ <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable>-2</define-tag> - <define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag>

1 0

r25670: {website} remove the stray "-1" suffix that was breaking download link (website/trunk/include)
by Roger Dingledine 05 Jun '12

05 Jun '12

Author: arma Date: 2012-06-05 13:35:27 +0000 (Tue, 05 Jun 2012) New Revision: 25670 Modified: website/trunk/include/versions.wmi Log: remove the stray "-1" suffix that was breaking download links for most vidalia packages Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-05 05:29:24 UTC (rev 25669) +++ website/trunk/include/versions.wmi 2012-06-05 13:35:27 UTC (rev 25670) @@ -65,35 +65,35 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-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> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> -<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> +<define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> -<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> +<define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.17-1.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.17.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17-1.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.17.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.17-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.17-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.17-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.17-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.17-ppc.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.17-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 05 Jun '12

05 Jun '12

commit ffcb96b10533033f6f2de01873c8fc96c5892ebb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 5 09:45:03 2012 +0000 Update translations for gettor --- ko_KR/gettor.po | 453 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 453 insertions(+), 0 deletions(-) diff --git a/ko_KR/gettor.po b/ko_KR/gettor.po new file mode 100644 index 0000000..bcf70bb --- /dev/null +++ b/ko_KR/gettor.po @@ -0,0 +1,453 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2010-11-30 05:01+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko_KR\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "" + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

r25669: {website} bump packages to tor 0.2.2.36 (website/trunk/include)
by Erinn Clark 05 Jun '12

05 Jun '12

Author: erinn Date: 2012-06-05 05:29:24 +0000 (Tue, 05 Jun 2012) New Revision: 25669 Modified: website/trunk/include/versions.wmi Log: bump packages to tor 0.2.2.36 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-04 20:18:49 UTC (rev 25668) +++ website/trunk/include/versions.wmi 2012-06-05 05:29:24 UTC (rev 25669) @@ -1,34 +1,34 @@ <define-tag version-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.35-<version-vidalia-stable>-2</define-tag> +<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.36-<version-vidalia-stable>-2</define-tag> <define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.15-alpha-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-osx-x86-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.36</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.15-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-13</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.36-1</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> @@ -38,9 +38,9 @@ <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-12</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-12</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.36-1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.36-1</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> @@ -48,9 +48,9 @@ <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-12</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-12</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.36-1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.36-1</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.36</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.17</define-tag>

1 0

[tor/master] Fix "make check-spaces" issues
by nickm＠torproject.org 05 Jun '12

05 Jun '12

commit 20d6f787aaea3252a07e5913e67cf63d60de4d9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 5 00:49:18 2012 -0400 Fix "make check-spaces" issues --- src/common/address.c | 1 + src/common/crypto.c | 3 ++- src/or/config.c | 1 - src/or/connection_edge.c | 8 ++++---- src/or/connection_or.c | 10 +++++----- src/or/router.c | 3 ++- src/or/routerlist.c | 8 ++++---- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index c734c6f..e56465f 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1696,3 +1696,4 @@ tor_addr_hostname_is_local(const char *name) !strcasecmp(name, "local") || !strcasecmpend(name, ".local"); } + diff --git a/src/common/crypto.c b/src/common/crypto.c index 9073d81..a69e6c5 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -69,7 +69,8 @@ /** Longest recognized */ #define MAX_DNS_LABEL_SIZE 63 -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8) && !defined(RUNNING_DOXYGEN) +#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8) && \ + !defined(RUNNING_DOXYGEN) /** @{ */ /** On OpenSSL versions before 0.9.8, there is no working SHA256 * implementation, so we use Tom St Denis's nice speedy one, slightly adapted diff --git a/src/or/config.c b/src/or/config.c index 1dce16f..ce90c41 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -820,7 +820,6 @@ get_short_version(void) return the_short_tor_version; } - /** Release additional memory allocated in options */ static void diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 51bd1ef..63a3213 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2007,8 +2007,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, * then we really don't want to try to connect to it. That's * probably an error. */ if (conn->is_transparent_ap) { -#define WARN_INTERVAL_LOOP 300 - static ratelim_t loop_warn_limit = RATELIM_INIT(WARN_INTERVAL_LOOP); +#define WARN_INTRVL_LOOP 300 + static ratelim_t loop_warn_limit = RATELIM_INIT(WARN_INTRVL_LOOP); char *m; if ((m = rate_limit_log(&loop_warn_limit, approx_time()))) { log_warn(LD_NET, @@ -2019,8 +2019,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, tor_free(m); } } else { -#define WARN_INTERVAL_PRIV 300 - static ratelim_t priv_warn_limit = RATELIM_INIT(WARN_INTERVAL_PRIV); +#define WARN_INTRVL_PRIV 300 + static ratelim_t priv_warn_limit = RATELIM_INIT(WARN_INTRVL_PRIV); char *m; if ((m = rate_limit_log(&priv_warn_limit, approx_time()))) { log_warn(LD_NET, diff --git a/src/or/connection_or.c b/src/or/connection_or.c index b5ef482..cbb1110 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -405,11 +405,11 @@ connection_or_process_inbuf(or_connection_t *conn) * 100% true. */ if (buf_datalen(conn->_base.inbuf) > MAX_OR_INBUF_WHEN_NONOPEN) { log_fn(LOG_PROTOCOL_WARN, LD_NET, "Accumulated too much data (%d bytes) " - "on nonopen OR connection %s %s:%u in state %s; closing.", - (int)buf_datalen(conn->_base.inbuf), - connection_or_nonopen_was_started_here(conn) ? "to" : "from", - conn->_base.address, conn->_base.port, - conn_state_to_string(conn->_base.type, conn->_base.state)); + "on nonopen OR connection %s %s:%u in state %s; closing.", + (int)buf_datalen(conn->_base.inbuf), + connection_or_nonopen_was_started_here(conn) ? "to" : "from", + conn->_base.address, conn->_base.port, + conn_state_to_string(conn->_base.type, conn->_base.state)); connection_mark_for_close(TO_CONN(conn)); ret = -1; } diff --git a/src/or/router.c b/src/or/router.c index a5addca..b98bb39 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1954,7 +1954,8 @@ router_guess_address_from_dir_headers(uint32_t *guess) void get_platform_str(char *platform, size_t len) { - tor_snprintf(platform, len, "Tor %s on %s", get_short_version(), get_uname()); + tor_snprintf(platform, len, "Tor %s on %s", + get_short_version(), get_uname()); } /* XXX need to audit this thing and count fenceposts. maybe diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 42063f2..c3e6f48 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5014,12 +5014,12 @@ update_router_have_minimum_dir_info(void) /* What fraction of desired server descriptors do we need before we will * build circuits? */ -#define FRACTION_USABLE_NEEDED .75 +#define FRAC_USABLE_NEEDED .75 /* What fraction of desired _exit_ server descriptors do we need before we * will build circuits? */ -#define FRACTION_EXIT_USABLE_NEEDED .5 +#define FRAC_EXIT_USABLE_NEEDED .5 - if (num_present < num_usable * FRACTION_USABLE_NEEDED) { + if (num_present < num_usable * FRAC_USABLE_NEEDED) { tor_snprintf(dir_info_status, sizeof(dir_info_status), "We have only %d/%d usable %sdescriptors.", num_present, num_usable, using_md ? "micro" : ""); @@ -5032,7 +5032,7 @@ update_router_have_minimum_dir_info(void) num_present, using_md ? "micro" : "", num_present ? "" : "s"); res = 0; goto done; - } else if (num_exit_present < num_exit_usable * FRACTION_EXIT_USABLE_NEEDED) { + } else if (num_exit_present < num_exit_usable * FRAC_EXIT_USABLE_NEEDED) { tor_snprintf(dir_info_status, sizeof(dir_info_status), "We have only %d/%d usable exit node descriptors.", num_exit_present, num_exit_usable);

1 0