December 2015 - tor-commits - lists.torproject.org

[tor/master] Restore semantics of advertise vs serve on directory cacheing
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit 0c8e042c30946faa564f03251bb3663e6204df9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 11 13:34:05 2015 -0500 Restore semantics of advertise vs serve on directory cacheing When we are low on accounted bandwidth, we stop advertising that we're a directory, but we will continue to answer directory requests, just as before. --- src/or/router.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 5c680ce..c1d970d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1099,11 +1099,26 @@ check_whether_dirport_reachable(void) can_reach_dir_port; } -/** The lower threshold of remaining bandwidth required to advertise directory - * services */ +/** The lower threshold of remaining bandwidth required to advertise (or + * automatically provide) directory services */ /* XXX Should this be increased? */ #define MIN_BW_TO_ADVERTISE_DIRSERVER 51200 +/** Return true iff we have enough configured bandwidth to cache directory + * information. */ +static int +router_has_bandwidth_to_be_dirserver(const or_options_t *options) +{ + if (options->BandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER) { + return 0; + } + if (options->RelayBandwidthRate > 0 && + options->RelayBandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER) { + return 0; + } + return 1; +} + /** Helper: Return 1 if we have sufficient resources for serving directory * requests, return 0 otherwise. * dir_port is either 0 or the configured DirPort number. @@ -1144,9 +1159,7 @@ router_should_be_directory_server(const or_options_t *options, int dir_port) new_choice = 0; reason = "AccountingMax enabled"; } - } else if (options->BandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER || - (options->RelayBandwidthRate > 0 && - options->RelayBandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER)) { + } else if (! router_has_bandwidth_to_be_dirserver(options)) { /* if we're advertising a small amount */ new_choice = 0; reason = "BandwidthRate under 50KB"; @@ -1178,8 +1191,8 @@ dir_server_mode(const or_options_t *options) { if (!options->DirCache) return 0; - return (server_mode(options) || options->DirPort_set) && - router_should_be_directory_server(options, 0); + return options->DirPort_set || + (server_mode(options) && router_has_bandwidth_to_be_dirserver(options)); } /** Look at a variety of factors, and return 0 if we don't want to @@ -1899,7 +1912,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); ri->dir_port = router_get_advertised_dir_port(options, 0); - ri->supports_tunnelled_dir_requests = dir_server_mode(options); + ri->supports_tunnelled_dir_requests = dir_server_mode(options) && + router_should_be_directory_server(options, ri->dir_port); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */

1 0

[tor/master] Fix nodelist/node_is_dir test wrt 12538.
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit a6c9fcc486f3a635b711ab0bea21e0a7494621de Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:24:23 2015 -0500 Fix nodelist/node_is_dir test wrt 12538. --- src/test/test_nodelist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 0a4151a..b0cb87d 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -85,7 +85,7 @@ test_nodelist_node_is_dir(void *arg) rs.is_v2_dir = 0; rs.dir_port = 1; - tt_assert(node_is_dir(&node)); + tt_assert(! node_is_dir(&node)); node.rs = NULL; tt_assert(!node_is_dir(&node)); @@ -94,10 +94,10 @@ test_nodelist_node_is_dir(void *arg) tt_assert(node_is_dir(&node)); ri.supports_tunnelled_dir_requests = 0; ri.dir_port = 1; - tt_assert(node_is_dir(&node)); + tt_assert(! node_is_dir(&node)); - done: - return; + done: + return; } #define NODE(name, flags) \

1 0

[tor/master] Fix config/directory_fetch after 12538 merge
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit f5f35e900987bab063f4f0aea99bf82e03267dc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:36:41 2015 -0500 Fix config/directory_fetch after 12538 merge --- src/test/test_config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 098b0a8..1b9e84d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3575,6 +3575,8 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; mock_router_get_my_routerinfo_result = &routerinfo; + routerinfo.supports_tunnelled_dir_requests = 1; + options->RefuseUnknownExits = 1; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1); @@ -3598,6 +3600,7 @@ test_config_directory_fetch(void *arg) memset(options, 0, sizeof(or_options_t)); options->DirPort_set = 1; options->ORPort_set = 1; + options->DirCache = 1; mock_router_pick_published_address_result = 0; mock_router_my_exit_policy_is_reject_star_result = 1; @@ -3629,6 +3632,7 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; routerinfo.dir_port = 0; + routerinfo.supports_tunnelled_dir_requests = 0; mock_router_get_my_routerinfo_result = &routerinfo; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1); @@ -3638,6 +3642,7 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; routerinfo.dir_port = 1; + routerinfo.supports_tunnelled_dir_requests = 1; mock_router_get_my_routerinfo_result = &routerinfo; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1);

1 0

[tor/master] fix routerlist/pick_directory_server_impl in light of 12538
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit f0a4282e9af25e6c77e6b8a0e59c4aa34e75b9bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 14:10:03 2015 -0500 fix routerlist/pick_directory_server_impl in light of 12538 --- src/test/test_dir_common.c | 1 + src/test/test_routerlist.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c index 5c899a9..44ea93b 100644 --- a/src/test/test_dir_common.c +++ b/src/test/test_dir_common.c @@ -143,6 +143,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now) rs->addr = 0xC0000203; rs->or_port = 500; rs->dir_port = 1999; + rs->is_v2_dir = 1; /* Running flag (and others) cleared */ break; case 4: diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index d86fe9c..090a607 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -241,6 +241,8 @@ test_router_pick_directory_server_impl(void *arg) node_router2 = node_get_mutable_by_id(router2_id); node_router3 = node_get_mutable_by_id(router3_id); + node_router1->is_possible_guard = 1; + node_router1->is_running = 0; node_router3->is_running = 0; rs = router_pick_directory_server_impl(V3_DIRINFO, flags, NULL);

1 0

[tor/master] Merge remote-tracking branch 'public/bug12538_merged'
by nickm＠torproject.org 21 Dec '15

21 Dec '15

1 0

[webwml/staging] fix dwolla's link
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 1a89e5aa3b10a8310ac56c51832f10556bcd6f4e Author: Nima Fatemi <nima(a)torproject.org> Date: Mon Dec 21 00:43:50 2015 +0000 fix dwolla's link --- donate/en/donate.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 490f1a3..4781579 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -256,7 +256,7 @@ <div class="dsmall col-xs-4"> <a id="dwolla"></a> - <a href="https://smile.amazon.com/ch/20-8096820"> + <a href="https://www.dwolla.com/hub/thetorproject"> <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/dwolla.jpg"> </a> </div>

1 0

[webwml/staging] make get-in-touch section responsive
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 7cecf080a12b5a9c42f5afb5112caf115b97a7b3 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 07:27:13 2015 +0800 make get-in-touch section responsive --- css/donate-style.css | 10 ++++++++++ donate/en/donate.wml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 741d3c5..1bd0eea 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -339,6 +339,16 @@ footer.footer{ .dsmall{ padding: 0 5%; } + .title { + min-height: auto; + margin: 20px 8% 0; + border-right: none; + border-bottom: 2px solid #3D855B; + padding: 0 0 10px; + } + .detail { + margin: 10px 0 20px; + } } @media (max-width: 659px) { diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 68b3e36..4d00b5c 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -271,10 +271,10 @@ <div class="get-in-touch"> <div class="container"> <div class="row"> - <div class="col-xs-4"> + <div class="col-sm-4"> <h3 class="title"><strong>Get in touch.</strong></h3> </div> - <div class="col-xs-8"> + <div class="col-sm-8"> <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> </div> </div>

1 0

[webwml/staging] make perks section responsive
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 6564f9a0c74c26f94e82e34fd450327d4904ee32 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 08:19:52 2015 +0800 make perks section responsive --- css/donate-style.css | 4 ++++ donate/en/donate.wml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 1bd0eea..7eb4ff0 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -147,6 +147,7 @@ html { } .no-padding{ padding: 0; + margin-bottom: 20px; } .half-opacity{ opacity: 0.5; @@ -336,6 +337,9 @@ footer.footer{ blockquote::before { display: none; } + #bitpayDonation > .well { + margin-bottom: 30px; + } .dsmall{ padding: 0 5%; } diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 4d00b5c..ae70b18 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -41,9 +41,9 @@ </noscript> <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> - <div class="col-sm-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> - <div class="col-sm-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> - <div class="col-sm-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div> + <div class="col-xs-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> + <div class="col-xs-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> + <div class="col-xs-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div> </div> <div class="donate-section col-sm-5">

1 0

[webwml/staging] fix other ways to donate link functionality
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 22088868a03ae9e9b55f7ce6e2993f787888ffa6 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 13:21:35 2015 +0800 fix other ways to donate link functionality scroll down the page to other ways donate section if click on other ways to donate link --- donate/en/donate.wml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 06d8289..490f1a3 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -91,7 +91,7 @@ <h5 class="error-msg">The minimum donation amount is $5</h5> <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button> <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> + <h4><a id="link" href="#other-ways-section">Other Ways to Donate</a></h4> </div>  @@ -370,6 +370,14 @@ $(".left").removeClass('active'); }); + + $("#link").on('click',function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $("#other-ways-section").offset().top + }, 200); + }); + });

1 0

[webwml/staging] reduce margins of donate section on smaller devices
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 3072e259d2fa94bd0b8d333589997314e9b495d0 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 08:34:44 2015 +0800 reduce margins of donate section on smaller devices --- css/donate-style.css | 9 +++++++++ donate/en/donate.wml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/css/donate-style.css b/css/donate-style.css index 7eb4ff0..8e1532f 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -195,6 +195,9 @@ input[type=number] { color: red; display: none; } +#donate > .btn-group { + margin-bottom: 30px; +} .quote-section{ background-color:#67467D; padding: 20px 0; @@ -337,6 +340,12 @@ footer.footer{ blockquote::before { display: none; } + .combined-input { + margin: 0 15px 15px 15px; + } + #donate > .btn-group { + margin-bottom: 15px; + } #bitpayDonation > .well { margin-bottom: 30px; } diff --git a/donate/en/donate.wml b/donate/en/donate.wml index ae70b18..06d8289 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -63,7 +63,7 @@ </div> </div> - <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;"> + <div class="btn-group btn-group-lg" role="group"> <div style="padding-bottom:5px;" class="col-xs-6"> <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button> </div>

1 0