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

r26425: {website} and declare that 0.2.3.x is the stable, not 0.2.1.x (website/trunk/include)
by Roger Dingledine 11 Nov '13

11 Nov '13

Author: arma Date: 2013-11-11 03:09:06 +0000 (Mon, 11 Nov 2013) New Revision: 26425 Modified: website/trunk/include/links.wmi Log: and declare that 0.2.3.x is the stable, not 0.2.1.x Modified: website/trunk/include/links.wmi =================================================================== --- website/trunk/include/links.wmi 2013-11-11 03:08:48 UTC (rev 26424) +++ website/trunk/include/links.wmi 2013-11-11 03:09:06 UTC (rev 26425) @@ -1,7 +1,7 @@ #!wml <define-tag gitblob whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=</define-tag> -<define-tag gitblobstable whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.1;f=</define-tag> +<define-tag gitblobstable whitespace=delete>https://gitweb.torproject.org/tor.git?a=blob_plain;hb=release-0.2.3;f=</define-tag> <define-tag gittree whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD;f=</define-tag> <define-tag gitrepo whitespace=delete>https://gitweb.torproject.org/tor.git?a=tree;hb=HEAD</define-tag> <define-tag svnwebsite whitespace=delete>https://svn.torproject.org/svn/website/trunk/</define-tag>

1 0

r26424: {website} use the wml link macros we made for tor gitweb (website/trunk/download/en)
by Roger Dingledine 11 Nov '13

11 Nov '13

Author: arma Date: 2013-11-11 03:08:48 +0000 (Mon, 11 Nov 2013) New Revision: 26424 Modified: website/trunk/download/en/download.wml Log: use the wml link macros we made for tor gitweb Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2013-11-11 02:29:21 UTC (rev 26423) +++ website/trunk/download/en/download.wml 2013-11-11 03:08:48 UTC (rev 26424) @@ -243,8 +243,8 @@ <h2>Source Tarball</h2> <p> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code></p> - <p>The current stable version of Tor is <version-stable>. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.3:/ReleaseNotes">release notes</a> are available.</p> - <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/tor-<version-alpha>:/ChangeLog">Changelog</a> is available.</p> + <p>The current stable version of Tor is <version-stable>. Its <a href="<gitblobstable>ReleaseNotes">release notes</a> are available.</p> + <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="<gitblob>ChangeLog">Changelog</a> is available.</p> </div> </div> <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>

1 0

[tor/release-0.2.4] Change documentation DirServer->DirAuthority
by arma＠torproject.org 11 Nov '13

11 Nov '13

commit 532f70a8076de227cd7f31e7bb3474f3b90d6b58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:21:23 2013 -0500 Change documentation DirServer->DirAuthority We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2. --- doc/tor.1.txt | 5 +++-- src/or/config.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b9ee296..938ed2c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -622,7 +622,7 @@ The following options are useful only for clients (that is, if [[Bridge]] **Bridge** [__transport__] __IP__:__ORPort__ [__fingerprint__]:: When set along with UseBridges, instructs Tor to use the relay at "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint" - is provided (using the same format as for DirServer), we will verify that + is provided (using the same format as for DirAuthority), we will verify that the relay running at that location has the right fingerprint. We also use fingerprint to look up the bridge descriptor at the bridge authority, if it's provided and if UpdateBridgesFromAuthority is set too. + @@ -2007,7 +2007,8 @@ The following options are used for running a testing Tor network. [[TestingTorNetwork]] **TestingTorNetwork** **0**|**1**:: If set to 1, Tor adjusts default values of the configuration options below, so that it is easier to set up a testing Tor network. May only be set if - non-default set of DirServers is set. Cannot be unset while Tor is running. + non-default set of DirAuthorities is set. Cannot be unset while Tor is + running. (Default: 0) + ServerDNSAllowBrokenConfig 1 diff --git a/src/or/config.c b/src/or/config.c index 18f1c29..7274b7e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3182,7 +3182,7 @@ options_validate(or_options_t *old_options, or_options_t *options, (options->AlternateDirAuthority && options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServer or both of AlternateDirAuthority " + "a non-default set of DirAuthority or both of AlternateDirAuthority " "and AlternateBridgeAuthority configured."); } @@ -4567,7 +4567,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, smartlist_split_string(items, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); if (smartlist_len(items) < 1) { - log_warn(LD_CONFIG, "No arguments on DirServer line."); + log_warn(LD_CONFIG, "No arguments on DirAuthority line."); goto err; } @@ -4595,7 +4595,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, char *portstring = flag + strlen("orport="); or_port = (uint16_t) tor_parse_long(portstring, 10, 1, 65535, &ok, NULL); if (!ok) - log_warn(LD_CONFIG, "Invalid orport '%s' on DirServer line.", + log_warn(LD_CONFIG, "Invalid orport '%s' on DirAuthority line.", portstring); } else if (!strcmpstart(flag, "weight=")) { int ok; @@ -4609,13 +4609,13 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, char *idstr = flag + strlen("v3ident="); if (strlen(idstr) != HEX_DIGEST_LEN || base16_decode(v3_digest, DIGEST_LEN, idstr, HEX_DIGEST_LEN)<0) { - log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirServer line", + log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirAuthority line", flag); } else { type |= V3_DIRINFO|EXTRAINFO_DIRINFO|MICRODESC_DIRINFO; } } else { - log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirServer line", + log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirAuthority line", flag); } tor_free(flag); @@ -4627,23 +4627,23 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, type &= ~V2_DIRINFO; if (smartlist_len(items) < 2) { - log_warn(LD_CONFIG, "Too few arguments to DirServer line."); + log_warn(LD_CONFIG, "Too few arguments to DirAuthority line."); goto err; } addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); if (addr_port_lookup(LOG_WARN, addrport, &address, NULL, &dir_port)<0) { - log_warn(LD_CONFIG, "Error parsing DirServer address '%s'", addrport); + log_warn(LD_CONFIG, "Error parsing DirAuthority address '%s'", addrport); goto err; } if (!dir_port) { - log_warn(LD_CONFIG, "Missing port in DirServer address '%s'",addrport); + log_warn(LD_CONFIG, "Missing port in DirAuthority address '%s'",addrport); goto err; } fingerprint = smartlist_join_strings(items, "", 0, NULL); if (strlen(fingerprint) != HEX_DIGEST_LEN) { - log_warn(LD_CONFIG, "Key digest '%s' for DirServer is wrong length %d.", + log_warn(LD_CONFIG, "Key digest '%s' for DirAuthority is wrong length %d.", fingerprint, (int)strlen(fingerprint)); goto err; } @@ -4656,7 +4656,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, goto err; } if (base16_decode(digest, DIGEST_LEN, fingerprint, HEX_DIGEST_LEN)<0) { - log_warn(LD_CONFIG, "Unable to decode DirServer key digest."); + log_warn(LD_CONFIG, "Unable to decode DirAuthority key digest."); goto err; }

1 0

[tor/release-0.2.4] Fix two more DirServer mentions in log
by arma＠torproject.org 11 Nov '13

11 Nov '13

commit 8bfa596c152603e376b8f096a3367c1d785d6763 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:23:56 2013 -0500 Fix two more DirServer mentions in log --- src/or/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 6efd851..eabd9c3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -955,14 +955,14 @@ init_keys(void) } if (ds->type != type) { log_warn(LD_DIR, "Configured authority type does not match authority " - "type in DirServer list. Adjusting. (%d v %d)", + "type in DirAuthority list. Adjusting. (%d v %d)", type, ds->type); ds->type = type; } if (v3_digest_set && (ds->type & V3_DIRINFO) && tor_memneq(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) { log_warn(LD_DIR, "V3 identity key does not match identity declared in " - "DirServer line. Adjusting."); + "DirAuthority line. Adjusting."); memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN); }

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 11 Nov '13

11 Nov '13

commit 6837a270250a52ee1189cb17f00e29cfa3070e73 Merge: 33b8607 8bfa596 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Nov 10 21:51:31 2013 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 doc/tor.1.txt | 5 +++-- src/or/config.c | 22 +++++++++++----------- src/or/router.c | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-)

1 0

[tor/release-0.2.4] Fix a wide line
by arma＠torproject.org 11 Nov '13

11 Nov '13

commit 56ac75b265ccd2c5f3e16cd3584ab64c47a77f9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:22:34 2013 -0500 Fix a wide line --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7274b7e..3984755 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3182,8 +3182,8 @@ options_validate(or_options_t *old_options, or_options_t *options, (options->AlternateDirAuthority && options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirAuthority or both of AlternateDirAuthority " - "and AlternateBridgeAuthority configured."); + "a non-default set of DirAuthority or both of " + "AlternateDirAuthority and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirAuthorities) {

1 0

r26423: {website} bump up two sponsors, on the theory that we should count mon (website/trunk/about/en)
by Roger Dingledine 11 Nov '13

11 Nov '13

Author: arma Date: 2013-11-11 02:29:21 +0000 (Mon, 11 Nov 2013) New Revision: 26423 Modified: website/trunk/about/en/sponsors.wml Log: bump up two sponsors, on the theory that we should count money promised in the future as funding Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-11-11 02:26:18 UTC (rev 26422) +++ website/trunk/about/en/sponsors.wml 2013-11-11 02:29:21 UTC (rev 26423) @@ -29,15 +29,15 @@ <h3><i>Liliopsida</i> (up to $1 million)</h3> <ul> <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-present)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> + <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-present)</li> </ul> <h3><i>Asparagales</i> (up to $500k)</h3> <ul> <li>Internews Europe (2006-2008)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012)</li> - <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-present)</li> </ul> <h3><i>Alliaceae</i> (up to $250k)</h3>

1 0

r26422: {website} add our new funder (woo!) (website/trunk/about/en)
by Roger Dingledine 11 Nov '13

11 Nov '13

Author: arma Date: 2013-11-11 02:26:18 +0000 (Mon, 11 Nov 2013) New Revision: 26422 Modified: website/trunk/about/en/sponsors.wml Log: add our new funder (woo!) Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-11-11 02:17:32 UTC (rev 26421) +++ website/trunk/about/en/sponsors.wml 2013-11-11 02:26:18 UTC (rev 26422) @@ -23,6 +23,7 @@ <li>An anonymous North American NGO (2008-2013)</li> <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2013)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2014)</li> + <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2015)</li> </ul> <h3><i>Liliopsida</i> (up to $1 million)</h3>

1 0

r26421: {website} put years in the future when we know them (website/trunk/about/en)
by Roger Dingledine 11 Nov '13

11 Nov '13

Author: arma Date: 2013-11-11 02:17:32 +0000 (Mon, 11 Nov 2013) New Revision: 26421 Modified: website/trunk/about/en/sponsors.wml Log: put years in the future when we know them Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-11-11 01:27:22 UTC (rev 26420) +++ website/trunk/about/en/sponsors.wml 2013-11-11 02:17:32 UTC (rev 26421) @@ -20,9 +20,9 @@ <h3><i>Magnoliophyta</i> (over $1 million)</h3> <ul> - <li>An anonymous North American NGO (2008-2012)</li> - <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2012)</li> - <li><a href="http://www.sri.com/">SRI International</a> (2011-present)</li> + <li>An anonymous North American NGO (2008-2013)</li> + <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2013)</li> + <li><a href="http://www.sri.com/">SRI International</a> (2011-2014)</li> </ul> <h3><i>Liliopsida</i> (up to $1 million)</h3> @@ -34,8 +34,8 @@ <ul> <li>Internews Europe (2006-2008)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-present)</li> - <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2012)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> + <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012)</li> <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-present)</li> </ul> @@ -54,9 +54,9 @@ <h3><i>Allium cepa</i> (up to $75k)</h3> <ul> <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> - <li><a href="https://www.accessnow.org/">Access Now</a> (2012-2012)</li> + <li><a href="https://www.accessnow.org/">Access Now</a> (2012)</li> <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li> - <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2012)</li> + <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-present)</li> <li><a href="http://www.hrw.org/">Human Rights Watch</a> (2007)</li> <li><a href="http://www.torfox.org/">Torfox</a> (2009)</li> <li><a href="http://www.shinjiru.com/">Shinjiru Technology</a> (2009-2011)</li>

1 0

r26420: {website} update funding sources based on current unaudited, unreviewe (website/trunk/about/en)
by Andrew Lewman 11 Nov '13

11 Nov '13

Author: phobos Date: 2013-11-11 01:27:22 +0000 (Mon, 11 Nov 2013) New Revision: 26420 Modified: website/trunk/about/en/sponsors.wml Log: update funding sources based on current unaudited, unreviewed data, addresses more of ticket 10013. Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-11-10 06:10:51 UTC (rev 26419) +++ website/trunk/about/en/sponsors.wml 2013-11-11 01:27:22 UTC (rev 26420) @@ -12,30 +12,31 @@ <div id="maincol"> <h1>Tor: Sponsors</h1> <p> - The Tor Project's <a href="<page about/torusers>">diversity of users</a> means we - have a diversity of funding sources too — and we're eager to diversify - even further! Our sponsorships are divided into levels based on total funding received (as of 2012): + The Tor Project's <a href="<page about/torusers>">diversity of + users</a> means we have a diversity of funding sources too — + and we're eager to diversify even further! Our sponsorships are + divided into levels based on total funding received: </p> <h3><i>Magnoliophyta</i> (over $1 million)</h3> <ul> <li>An anonymous North American NGO (2008-2012)</li> <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2012)</li> - <li><a href="http://www.sri.com/">SRI International</a> (2011-2012)</li> + <li><a href="http://www.sri.com/">SRI International</a> (2011-present)</li> </ul> <h3><i>Liliopsida</i> (up to $1 million)</h3> <ul> - <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2012)</li> + <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-present)</li> </ul> <h3><i>Asparagales</i> (up to $500k)</h3> <ul> <li>Internews Europe (2006-2008)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li> - <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2012)</li> + <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-present)</li> <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2012)</li> - <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2012)</li> + <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-present)</li> </ul> <h3><i>Alliaceae</i> (up to $250k)</h3> @@ -47,12 +48,12 @@ <ul> <li><a href="http://www.nlnet.nl/">NLnet Foundation</a> (2008-2009)</li> <li><a href="http://www.nrl.navy.mil/">Naval Research Laboratory</a> (2006-2010)</li> - <li>An anonymous North American ISP (2009-2012)</li> + <li>An anonymous North American ISP (2009-present)</li> </ul> <h3><i>Allium cepa</i> (up to $75k)</h3> <ul> - <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-2012)</li> + <li><a href="<page donate/donate>">More than 4,300 personal donations from individuals like you</a> (2006-present)</li> <li><a href="https://www.accessnow.org/">Access Now</a> (2012-2012)</li> <li><a href="http://code.google.com/opensource/">Google</a> (2008-2009)</li> <li><a href="http://code.google.com/soc/">Google Summer of Code</a> (2007-2012)</li> @@ -77,7 +78,10 @@ non-financial contributions: coding, testing, documenting, educating, researching, and running the relays that make up the Tor network. </p> - <p>Further details about our funding can be found on our <a href="<page about/financials>">Financial Reports</a> page. + <p>This sponsors page is based upon un-audited and un-reviewed + financial data. Further details about our audited and reviewed funding + can be found on our <a href="<page about/financials>">Financial + Reports</a> page. </p> </div>

1 0