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

[tor/maint-0.2.2] exit_policy_is_general_exit is IPv4 only; it should admit it.
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 0a8fd73..f8c36c7 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -880,6 +880,8 @@ exit_policy_is_general_exit(smartlist_t *policy) for (i = 0; i < 3; ++i) { SMARTLIST_FOREACH(policy, addr_policy_t *, p, { + if (tor_addr_family(&p->addr) != AF_INET) + continue; /* IPv4 only for now */ if (p->prt_min > ports[i] || p->prt_max < ports[i]) continue; /* Doesn't cover our port. */ if (p->maskbits > 8)

1 0

[tor/maint-0.2.2] Disallow reject6 and accept6 lines in descriptors
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 6 18:20:28 2011 +0100 Disallow reject6 and accept6 lines in descriptors This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors with ipv6 contents well yet. We will want to revert this once we're ready to handle ipv6. Issue raised by lorth on #tor, who wasn't able to use Tor anymore. Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix on 0.2.1.3-alpha. --- src/or/routerparse.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aa0687d..d76b006 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -222,8 +222,6 @@ typedef struct token_rule_t { static token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), - T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), - T0N("accept6", K_ACCEPT6, ARGS, NO_OBJ ), T1_START( "router", K_ROUTER, GE(5), NO_OBJ ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),

1 0

[tor/maint-0.2.2] Changes file for ipv6 parsing issue
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash b/changes/ipv6_crash new file mode 100644 index 0000000..2b04355 --- /dev/null +++ b/changes/ipv6_crash @@ -0,0 +1,3 @@ + o Major bugfixes (directory authority) + - Fix a crash in parsing router descriptors containing IPv6 + addresses. Bugfix on 0.2.1.3-alpha.

1 0

[tor/maint-0.2.1] Changes file for ipv6 parsing issue
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash b/changes/ipv6_crash new file mode 100644 index 0000000..2b04355 --- /dev/null +++ b/changes/ipv6_crash @@ -0,0 +1,3 @@ + o Major bugfixes (directory authority) + - Fix a crash in parsing router descriptors containing IPv6 + addresses. Bugfix on 0.2.1.3-alpha.

1 0

[tor/maint-0.2.1] exit_policy_is_general_exit is IPv4 only; it should admit it.
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/policies.c b/src/or/policies.c index 0a8fd73..f8c36c7 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -880,6 +880,8 @@ exit_policy_is_general_exit(smartlist_t *policy) for (i = 0; i < 3; ++i) { SMARTLIST_FOREACH(policy, addr_policy_t *, p, { + if (tor_addr_family(&p->addr) != AF_INET) + continue; /* IPv4 only for now */ if (p->prt_min > ports[i] || p->prt_max < ports[i]) continue; /* Doesn't cover our port. */ if (p->maskbits > 8)

1 0

[tor/maint-0.2.1] Disallow reject6 and accept6 lines in descriptors
by nickm＠torproject.org 06 Mar '11

06 Mar '11

commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 6 18:20:28 2011 +0100 Disallow reject6 and accept6 lines in descriptors This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors with ipv6 contents well yet. We will want to revert this once we're ready to handle ipv6. Issue raised by lorth on #tor, who wasn't able to use Tor anymore. Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix on 0.2.1.3-alpha. --- src/or/routerparse.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aa0687d..d76b006 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -222,8 +222,6 @@ typedef struct token_rule_t { static token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), - T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), - T0N("accept6", K_ACCEPT6, ARGS, NO_OBJ ), T1_START( "router", K_ROUTER, GE(5), NO_OBJ ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ),

1 0

[weather/master] Use correct mailing list when mailing new Tor relay operators. Thanks, Michael.
by kaner＠torproject.org 06 Mar '11

06 Mar '11

commit 45a0fd1f6e05633f4f14214849c5279e16f595fc Author: Christian Fromme <kaner(a)strace.org> Date: Sun Mar 6 14:44:23 2011 +0100 Use correct mailing list when mailing new Tor relay operators. Thanks, Michael. --- weather/weatherapp/emails.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/weather/weatherapp/emails.py b/weather/weatherapp/emails.py index 5b8b8db..af4121f 100644 --- a/weather/weatherapp/emails.py +++ b/weather/weatherapp/emails.py @@ -119,11 +119,10 @@ _WELCOME_MAIL = "Hello and welcome to Tor!\n\n" +\ "operators. If you're interested in Tor Weather, please visit the "+\ "following link to register:\n\n"+\ "%s\n\n"+\ - "You might also be interested in the or-announce mailing list, "+\ + "You might also be interested in the tor-announce mailing list, "+\ "which is a low volume list for announcements of new releases and "+\ - "critical security updates. To join, send an e-mail message to "+\ - "majordomo(a)seul.org "+\ - "with no subject and a body of \"subscribe or-announce\". \n\n"+\ + "critical security updates. To join, visit the following address:\n\n"+\ + "https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce\n\n"+\ "%sThank you again for your contribution to the Tor network! "+\ "We won't send you any further emails unless you subscribe.\n\n"+\ "Disclaimer: If you have no idea why you're receiving this email, we "+\

1 0

[torsocks/master] Remove some cruft from Makefile.am
by hoganrobert＠torproject.org 05 Mar '11

05 Mar '11

commit fbe281f006d7bbab765ff3a32f005648a0dbcff1 Author: Robert Hogan <robert(a)roberthogan.net> Date: Wed Mar 2 20:28:49 2011 +0000 Remove some cruft from Makefile.am --- test/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 159e3c9..c04e5ea 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,5 @@ noinst_PROGRAMS= test_torsocks test_torsocks_SOURCES= test_torsocks.c -AM_LDFLAGS= test_torsocks_LDFLAGS= $(TESTLDFLAGS) CLEANFILES= test_torsocks

1 0

r24307: {website} Making the link from the gsoc -> projects page more prominen (website/trunk/about/en)
by Damian Johnson 04 Mar '11

04 Mar '11

Author: atagar Date: 2011-03-04 16:30:18 +0000 (Fri, 04 Mar 2011) New Revision: 24307 Modified: website/trunk/about/en/gsoc.wml Log: Making the link from the gsoc -> projects page more prominent (for students this will be the most important link on the page since it has the ideas, so we want it to stand out). Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2011-03-04 16:12:02 UTC (rev 24306) +++ website/trunk/about/en/gsoc.wml 2011-03-04 16:30:18 UTC (rev 24307) @@ -93,8 +93,9 @@ <h2><a class="anchor" href="#Ideas">Ideas List</a></h2> <p> - This year, we started an ideas list about projects to - <a href="<page getinvolved/volunteer>#Projects">help develop Tor</a>. + To start with, please see our <b><a href="<page + getinvolved/volunteer>#Projects">projects page</a></b> and its following + ideas. </p> <p>

1 0

r24306: {translation} updated translation from transifex for the website (in translation/trunk/projects/website/po: .tx zh_CN/about)
by Runa Sandvik 04 Mar '11

04 Mar '11

Author: runa Date: 2011-03-04 16:12:02 +0000 (Fri, 04 Mar 2011) New Revision: 24306 Modified: translation/trunk/projects/website/po/.tx/config translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po Log: updated translation from transifex for the website Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-03-04 13:42:46 UTC (rev 24305) +++ translation/trunk/projects/website/po/.tx/config 2011-03-04 16:12:02 UTC (rev 24306) @@ -3,6 +3,11 @@ source_file = templates/docs/1-high.bridges.pot source_lang = en +[torproject.website-docs-android-pot] +file_filter = <lang>/docs/3-low.android.po +source_file = templates/docs/3-low.android.pot +source_lang = en + [torproject.website-about-contact-pot] file_filter = <lang>/about/3-low.contact.po source_file = templates/about/3-low.contact.pot @@ -28,9 +33,9 @@ source_file = templates/about/2-medium.overview.pot source_lang = en -[torproject.website-press-inthemedia-pot] -file_filter = <lang>/press/3-low.inthemedia.po -source_file = templates/press/3-low.inthemedia.pot +[torproject.website-docs-debian-pot] +file_filter = <lang>/docs/3-low.debian.po +source_file = templates/docs/3-low.debian.pot source_lang = en [torproject.website-getinvolved-tshirt-pot] @@ -73,9 +78,9 @@ source_file = templates/about/3-low.sponsors.pot source_lang = en -[torproject.website-download-download-pot] -file_filter = <lang>/download/3-low.download.po -source_file = templates/download/3-low.download.pot +[torproject.website-docs-N900-pot] +file_filter = <lang>/docs/3-low.N900.po +source_file = templates/docs/3-low.N900.pot source_lang = en [torproject.website-projects-vidalia-pot] @@ -83,11 +88,6 @@ source_file = templates/projects/4-optional.vidalia.pot source_lang = en -[torproject.website-torbutton-torbutton-options-pot] -file_filter = <lang>/torbutton/3-low.torbutton-options.po -source_file = templates/torbutton/3-low.torbutton-options.pot -source_lang = en - [torproject.website-docs-rpms-pot] file_filter = <lang>/docs/3-low.rpms.po source_file = templates/docs/3-low.rpms.pot @@ -98,9 +98,9 @@ source_file = templates/donate/3-low.matching-program.pot source_lang = en -[torproject.website-docs-N900-pot] -file_filter = <lang>/docs/3-low.N900.po -source_file = templates/docs/3-low.N900.pot +[torproject.website-download-download-pot] +file_filter = <lang>/download/3-low.download.po +source_file = templates/download/3-low.download.pot source_lang = en [torproject.website-docs-debian-vidalia-pot] @@ -118,16 +118,11 @@ source_file = templates/torbutton/3-low.index.pot source_lang = en -[torproject.website-getinvolved-translation-overview-pot] -file_filter = <lang>/getinvolved/4-optional.translation-overview.po -source_file = templates/getinvolved/4-optional.translation-overview.pot +[torproject.website-press-inthemedia-pot] +file_filter = <lang>/press/3-low.inthemedia.po +source_file = templates/press/3-low.inthemedia.pot source_lang = en -[torproject.website-docs-debian-pot] -file_filter = <lang>/docs/3-low.debian.po -source_file = templates/docs/3-low.debian.pot -source_lang = en - [torproject.website-projects-torbrowser-pot] file_filter = <lang>/projects/1-high.torbrowser.po source_file = templates/projects/1-high.torbrowser.pot @@ -138,11 +133,6 @@ source_file = templates/torbutton/3-low.torbutton-faq.pot source_lang = en -[torproject.website-docs-highproxychain-pot] -file_filter = <lang>/docs/1-high.proxychain.po -source_file = templates/docs/1-high.proxychain.pot -source_lang = en - [torproject.website-docs-installguide-pot] file_filter = <lang>/docs/2-medium.installguide.po source_file = templates/docs/2-medium.installguide.pot @@ -191,11 +181,16 @@ source_file = templates/docs/2-medium.documentation.pot source_lang = en -[torproject.website-press-2010-03-25-press-release-pot] -file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po -source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot +[torproject.website-getinvolved-translation-overview-pot] +file_filter = <lang>/getinvolved/4-optional.translation-overview.po +source_file = templates/getinvolved/4-optional.translation-overview.pot source_lang = en +[torproject.website-docs-trademark-faq-pot] +file_filter = <lang>/docs/3-low.trademark-faq.po +source_file = templates/docs/3-low.trademark-faq.pot +source_lang = en + [torproject.website-download-download-unix-pot] file_filter = <lang>/download/3-low.download-unix.po source_file = templates/download/3-low.download-unix.pot @@ -211,11 +206,6 @@ source_file = templates/projects/3-low.gettor.pot source_lang = en -[torproject.website-projects-puppettor-pot] -file_filter = <lang>/projects/3-low.puppettor.po -source_file = templates/projects/3-low.puppettor.pot -source_lang = en - [torproject.website-docs-faq-pot] file_filter = <lang>/docs/2-medium.faq.po source_file = templates/docs/2-medium.faq.pot @@ -246,11 +236,16 @@ source_file = templates/donate/3-low.donate-hardware.pot source_lang = en -[torproject.website-docs-trademark-faq-pot] -file_filter = <lang>/docs/3-low.trademark-faq.po -source_file = templates/docs/3-low.trademark-faq.pot +[torproject.website-docs-highproxychain-pot] +file_filter = <lang>/docs/1-high.proxychain.po +source_file = templates/docs/1-high.proxychain.pot source_lang = en +[torproject.website-projects-puppettor-pot] +file_filter = <lang>/projects/3-low.puppettor.po +source_file = templates/projects/3-low.puppettor.pot +source_lang = en + [torproject.website-download-download-easy-pot] file_filter = <lang>/download/1-high.download-easy.po source_file = templates/download/1-high.download-easy.pot @@ -261,6 +256,11 @@ source_file = templates/docs/3-low.tor-doc-web.pot source_lang = en +[torproject.website-press-2010-03-25-press-release-pot] +file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po +source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot +source_lang = en + [torproject.website-getinvolved-open-positions-pot] file_filter = <lang>/getinvolved/4-optional.open-positions.po source_file = templates/getinvolved/4-optional.open-positions.pot @@ -296,9 +296,9 @@ source_file = templates/donate/3-low.donate-service.pot source_lang = en -[torproject.website-docs-android-pot] -file_filter = <lang>/docs/3-low.android.po -source_file = templates/docs/3-low.android.pot +[torproject.website-torbutton-torbutton-options-pot] +file_filter = <lang>/torbutton/3-low.torbutton-options.po +source_file = templates/torbutton/3-low.torbutton-options.pot source_lang = en [torproject.website-projects-torbrowser-split-pot] Modified: translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po =================================================================== --- translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 13:42:46 UTC (rev 24305) +++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-03-04 16:12:02 UTC (rev 24306) @@ -8,7 +8,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-03-01 16:37+0000\n" -"PO-Revision-Date: 2011-03-04 13:30+0000\n" +"PO-Revision-Date: 2011-03-04 16:10+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n"

1 0