- tor-commits - lists.torproject.org

r24734: {website} fix a missing </a>, link to spaces. (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 01:43:30 +0000 (Tue, 10 May 2011) New Revision: 24734 Modified: website/trunk/donate/en/donate.wml Log: fix a missing </a>, link to spaces. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:18:00 UTC (rev 24733) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:43:30 UTC (rev 24734) @@ -30,7 +30,7 @@ <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  <a id="paypal"></a> - <a class="anchor" href="#paypal"></a> + <a class="anchor" href="#paypal"> </a> <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> @@ -126,7 +126,7 @@   <a id="amazon"></a> - <a class="anchor" href="#amazon"></a> + <a class="anchor" href="#amazon"> </a> <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> @@ -158,7 +158,7 @@   <a id="google"></a> - <a class="anchor" href="#google"></a> + <a class="anchor" href="#google"> </a> <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> @@ -202,7 +202,7 @@   <a id="givv"></a> - <a class="anchor" href="#givv"> + <a class="anchor" href="#givv"> </a> <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. @@ -212,7 +212,7 @@   <a id="cash"></a> - <a class="anchor" href="#cash"></a> + <a class="anchor" href="#cash"> </a> <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> <p>You can send checks or money orders to:</p>

1 0

r24733: {website} keeping the purple highlight clean looks better. (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 01:18:00 +0000 (Tue, 10 May 2011) New Revision: 24733 Modified: website/trunk/donate/en/donate.wml Log: keeping the purple highlight clean looks better. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:14:05 UTC (rev 24732) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:18:00 UTC (rev 24733) @@ -126,7 +126,8 @@   <a id="amazon"></a> - <div class="title topforty"><a class="anchor" href="#amazon">Single Donation via Amazon Payments</a></div> + <a class="anchor" href="#amazon"></a> + <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -157,8 +158,8 @@   <a id="google"></a> - <div class="title topforty"><a class="anchor" href="#google">Single -Donation via Google Checkout</a></div> + <a class="anchor" href="#google"></a> + <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -201,9 +202,8 @@   <a id="givv"></a> - <div class="title topforty"><a class="anchor" href="#givv">Donate via -Givv.org</a> - </div> + <a class="anchor" href="#givv"> + <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. You stay anonymous and stay in control! @@ -212,9 +212,8 @@   <a id="cash"></a> - <div class="title toptwenty"><a class="anchor" href="#cash">Donate via -Check, Cash, or Money Order</a> - </div> + <a class="anchor" href="#cash"></a> + <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br>

1 0

r24732: {website} lets see if this looks better in the purple highlight. (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 01:14:05 +0000 (Tue, 10 May 2011) New Revision: 24732 Modified: website/trunk/donate/en/donate.wml Log: lets see if this looks better in the purple highlight. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:10:35 UTC (rev 24731) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:14:05 UTC (rev 24732) @@ -30,8 +30,8 @@ <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  <a id="paypal"></a> - <div class="title toptwenty"> <a class="anchor" href="#paypal">Tor Project -Subscription via PayPal</a></div> + <a class="anchor" href="#paypal"></a> + <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> <h4>Monthly Subscription to The Tor Project</h4> @@ -126,8 +126,7 @@   <a id="amazon"></a> - <div class="title topforty"><a class="anchor" href="#amazon">Single Donation -via Amazon Payments</a></div> + <div class="title topforty"><a class="anchor" href="#amazon">Single Donation via Amazon Payments</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4>

1 0

r24731: {website} make the list of ways to donate a linkable list to the corre (website/trunk/donate/en)
by Andrew Lewman 10 May '11

10 May '11

Author: phobos Date: 2011-05-10 01:10:35 +0000 (Tue, 10 May 2011) New Revision: 24731 Modified: website/trunk/donate/en/donate.wml Log: make the list of ways to donate a linkable list to the correct section below. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-07 04:03:13 UTC (rev 24730) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:10:35 UTC (rev 24731) @@ -20,16 +20,18 @@ href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>. We're happy to accept donations via: <ul> - <li>Paypal</li> - <li>Amazon Payments</li> - <li>Google Checkout</li> - <li>Givv.org</li> - <li>checks, money orders, bank transfers, stock grants or other more - sophisticated transactions.</li> + <li><a href="#paypal">Paypal</a></li> + <li><a href="#amazon">Amazon Payments</a></li> + <li><a href="#google">Google Checkout</a></li> + <li><a href="#givv">Givv.org</a></li> + <li><a href="#cash">checks, money orders, bank transfers, stock grants or +other more sophisticated transactions.</a></li> </ul></p> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  - <div class="title toptwenty">Tor Project Subscription via PayPal</div> + <a id="paypal"></a> + <div class="title toptwenty"> <a class="anchor" href="#paypal">Tor Project +Subscription via PayPal</a></div> <div class="left hundred"> <div class="paypal focus"> <h4>Monthly Subscription to The Tor Project</h4> @@ -123,7 +125,9 @@ </div>   - <div class="title topforty">Single Donation via Amazon Payments</div> + <a id="amazon"></a> + <div class="title topforty"><a class="anchor" href="#amazon">Single Donation +via Amazon Payments</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -153,12 +157,14 @@ </div>   - <div class="title topforty">Single Donation via Google Checkout</div> + <a id="google"></a> + <div class="title topforty"><a class="anchor" href="#google">Single +Donation via Google Checkout</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> -<script type="text/javascript"> +<script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -195,7 +201,9 @@ </div>   - <div class="title topforty">Donate via Givv.org + <a id="givv"></a> + <div class="title topforty"><a class="anchor" href="#givv">Donate via +Givv.org</a> </div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. @@ -204,7 +212,9 @@ </div>   - <div class="title toptwenty">Donate via Check, Cash, or Money Order + <a id="cash"></a> + <div class="title toptwenty"><a class="anchor" href="#cash">Donate via +Check, Cash, or Money Order</a> </div> <div class="left hundred"> <p>You can send checks or money orders to:</p>

1 0

[tor/master] Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
by nickm＠torproject.org 10 May '11

10 May '11

commit 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 Merge: 0b3166f cd42ae7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:37:56 2011 -0400 Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2 changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 10 May '11

10 May '11

commit e6980faec43504ac32ddd96d9c2bddcccca3a21b Merge: acd6a48 09d7af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:39:51 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/directory.c changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --cc src/or/directory.c index 145de3d,68734e6..313c6c5 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -357,19 -347,20 +357,20 @@@ directory_get_from_dirserver(uint8_t di * it elsewhere in directory.c. -RD */ switch (dir_purpose) { case DIR_PURPOSE_FETCH_EXTRAINFO: - type = EXTRAINFO_CACHE | - (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = EXTRAINFO_DIRINFO | + (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: - type = V2_AUTHORITY; + type = V2_DIRINFO; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: - type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_RENDDESC: - type = HIDSERV_AUTHORITY; + type = HIDSERV_DIRINFO; break; case DIR_PURPOSE_FETCH_STATUS_VOTE: case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:

1 0

[tor/master] Only authorities should automatically download v2 networkstatus documents
by nickm＠torproject.org 10 May '11

10 May '11

commit cd42ae71850985ed8dd34ae73dc6265a643fcb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 10:05:32 2011 -0400 Only authorities should automatically download v2 networkstatus documents Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022. --- changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug3022 b/changes/bug3022 new file mode 100644 index 0000000..9472e6d --- /dev/null +++ b/changes/bug3022 @@ -0,0 +1,6 @@ + o Removed features + - Caches no longer download and serve v2 networkstatus documents + unless FetchV2Networkstatus flag is set: these documents haven't + haven't been used by clients or relays since 0.2.0.x. Resolves + bug 3022. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04a0537..c408aa9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1171,6 +1171,12 @@ if DirPort is non-zero): Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above. +**FetchV2Networkstatus** **0**|**1**:: + If set, we try to fetch the (obsolete, unused) version 2 network status + consensus documents from the directory authorities. No currently + supported Tor version uses them. (Default: 0.) + + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index f003e4d..ab9c5db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -255,6 +255,7 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), + V(FetchV2Networkstatus, BOOL, "0"), #ifdef WIN32 V(GeoIPFile, FILENAME, "<default>"), #else diff --git a/src/or/directory.c b/src/or/directory.c index 0c095fe..68734e6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -353,6 +353,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: type = V2_AUTHORITY; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4f6fe15..a50d3ca 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1356,7 +1356,7 @@ update_networkstatus_downloads(time_t now) or_options_t *options = get_options(); if (should_delay_dir_fetches(options)) return; - if (directory_fetches_dir_info_early(options)) + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) update_v2_networkstatus_cache_downloads(now); update_consensus_networkstatus_downloads(now); update_certificate_downloads(now); diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..30179e5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2489,7 +2489,9 @@ typedef struct { /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ - int FetchHidServDescriptors; /** and hidden service descriptors? */ + int FetchHidServDescriptors; /**< and hidden service descriptors? */ + int FetchV2Networkstatus; /**< Do we fetch v2 networkstatus documents when + * we don't need to? */ int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
by nickm＠torproject.org 10 May '11

10 May '11

commit 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 Merge: 0b3166f cd42ae7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:37:56 2011 -0400 Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2 changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] Only authorities should automatically download v2 networkstatus documents
by nickm＠torproject.org 10 May '11

10 May '11

commit cd42ae71850985ed8dd34ae73dc6265a643fcb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 10:05:32 2011 -0400 Only authorities should automatically download v2 networkstatus documents Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022. --- changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug3022 b/changes/bug3022 new file mode 100644 index 0000000..9472e6d --- /dev/null +++ b/changes/bug3022 @@ -0,0 +1,6 @@ + o Removed features + - Caches no longer download and serve v2 networkstatus documents + unless FetchV2Networkstatus flag is set: these documents haven't + haven't been used by clients or relays since 0.2.0.x. Resolves + bug 3022. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04a0537..c408aa9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1171,6 +1171,12 @@ if DirPort is non-zero): Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above. +**FetchV2Networkstatus** **0**|**1**:: + If set, we try to fetch the (obsolete, unused) version 2 network status + consensus documents from the directory authorities. No currently + supported Tor version uses them. (Default: 0.) + + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index f003e4d..ab9c5db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -255,6 +255,7 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), + V(FetchV2Networkstatus, BOOL, "0"), #ifdef WIN32 V(GeoIPFile, FILENAME, "<default>"), #else diff --git a/src/or/directory.c b/src/or/directory.c index 0c095fe..68734e6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -353,6 +353,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: type = V2_AUTHORITY; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4f6fe15..a50d3ca 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1356,7 +1356,7 @@ update_networkstatus_downloads(time_t now) or_options_t *options = get_options(); if (should_delay_dir_fetches(options)) return; - if (directory_fetches_dir_info_early(options)) + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) update_v2_networkstatus_cache_downloads(now); update_consensus_networkstatus_downloads(now); update_certificate_downloads(now); diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..30179e5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2489,7 +2489,9 @@ typedef struct { /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ - int FetchHidServDescriptors; /** and hidden service descriptors? */ + int FetchHidServDescriptors; /**< and hidden service descriptors? */ + int FetchV2Networkstatus; /**< Do we fetch v2 networkstatus documents when + * we don't need to? */ int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden

1 0

[tor/master] Remove a duplicated line, found by clang
by nickm＠torproject.org 10 May '11

10 May '11

commit d7d25558fafbff15fb10c6e226824f9f0f6d99c7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 04:45:48 2011 +0200 Remove a duplicated line, found by clang --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..fc2097f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1240,7 +1240,7 @@ connection_connect(connection_t *conn, const char *address, { int s, inprogress = 0; char addrbuf[256]; - struct sockaddr *dest_addr = (struct sockaddr*) addrbuf; + struct sockaddr *dest_addr; socklen_t dest_addr_len; or_options_t *options = get_options(); int protocol_family;

1 0