September 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Bug 23077: Make channelpadding tests use mocked time.
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 361014255f5f096b742af56be2df4243febbd24b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 14 01:18:30 2017 +0000 Bug 23077: Make channelpadding tests use mocked time. --- changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/changes/bug23077 b/changes/bug23077 new file mode 100644 index 000000000..5ed1c5674 --- /dev/null +++ b/changes/bug23077 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Fix a channelpadding unit test failure on extremely slow systems + by using mocked time instead of actual time. Fixes bug 23077; bugfix on + 0.3.1.1-alpha. diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 3b889991b..bdc61d329 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -1,6 +1,7 @@ #define TOR_CHANNEL_INTERNAL_ #define MAIN_PRIVATE #define NETWORKSTATUS_PRIVATE +#define TOR_TIMERS_PRIVATE #include "or.h" #include "test.h" #include "testsupport.h" @@ -29,6 +30,8 @@ void test_channelpadding_decide_to_pad_channel(void *arg); void dummy_nop_timer(void); +#define NSEC_PER_MSEC (1000*1000) + /* Thing to cast to fake tor_tls_t * to appease assert_connection_ok() */ static int fake_tortls = 0; /* Bleh... */ @@ -350,6 +353,7 @@ test_channelpadding_consensus(void *arg) channelpadding_decision_t decision; or_options_t *options = get_options_mutable(); int64_t val; + int64_t new_time; (void)arg; tor_libevent_postfork(); @@ -372,7 +376,9 @@ test_channelpadding_consensus(void *arg) */ channel_t *chan; routerstatus_t *relay = tor_malloc_zero(sizeof(routerstatus_t)); - monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); timers_initialize(); connection_array = smartlist_new(); @@ -399,7 +405,10 @@ test_channelpadding_consensus(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); @@ -452,7 +461,10 @@ test_channelpadding_consensus(void *arg) tt_i64_op(val, OP_LE, 200); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+201)*NSEC_PER_MSEC; + monotime_set_mock_time_nsec(new_time); + monotime_coarse_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); @@ -555,6 +567,7 @@ test_channelpadding_consensus(void *arg) tor_free(current_ns_consensus); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return; @@ -725,12 +738,16 @@ test_channelpadding_decide_to_pad_channel(void *arg) * + We should not send padding */ channel_t *chan; + int64_t new_time; connection_array = smartlist_new(); (void)arg; tor_libevent_postfork(); monotime_init(); + monotime_enable_test_mocking(); + monotime_set_mock_time_nsec(1); + monotime_coarse_set_mock_time_nsec(1); timers_initialize(); setup_full_capture_of_logs(LOG_WARN); channelpadding_new_consensus_params(NULL); @@ -762,7 +779,10 @@ test_channelpadding_decide_to_pad_channel(void *arg) tt_int_op(tried_to_write_cell, OP_EQ, 0); // Wait for the timer from case #2b - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec() + 1000)*NSEC_PER_MSEC; + monotime_set_mock_time_nsec(new_time); + monotime_coarse_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); @@ -779,7 +799,10 @@ test_channelpadding_decide_to_pad_channel(void *arg) tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_ALREADY_SCHEDULED); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); @@ -811,7 +834,11 @@ test_channelpadding_decide_to_pad_channel(void *arg) channel_timestamp_active(chan); // We don't expect any timer callbacks here. Make a dummy one to be sure. - dummy_nop_timer(); + // Wait for the timer + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 0); tt_assert(!chan->pending_padding_callback); @@ -828,7 +855,10 @@ test_channelpadding_decide_to_pad_channel(void *arg) chan->state = CHANNEL_STATE_MAINT; // We don't expect any timer callbacks here. Make a dummy one to be sure. - dummy_nop_timer(); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 0); tt_assert(!chan->pending_padding_callback); @@ -843,7 +873,11 @@ test_channelpadding_decide_to_pad_channel(void *arg) tt_int_op(tried_to_write_cell, OP_EQ, 0); // Wait for the timer - event_base_loop(tor_libevent_get_base(), 0); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); + tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); @@ -870,7 +904,10 @@ test_channelpadding_decide_to_pad_channel(void *arg) free_fake_channeltls((channel_tls_t*)chan); // We don't expect any timer callbacks here. Make a dummy one to be sure. - dummy_nop_timer(); + new_time = (monotime_coarse_absolute_msec()+101)*NSEC_PER_MSEC; + monotime_coarse_set_mock_time_nsec(new_time); + monotime_set_mock_time_nsec(new_time); + timers_run_pending(); tt_int_op(tried_to_write_cell, OP_EQ, 0); @@ -878,6 +915,7 @@ test_channelpadding_decide_to_pad_channel(void *arg) smartlist_free(connection_array); teardown_capture_of_logs(); + monotime_disable_test_mocking(); timers_shutdown(); channel_free_all();

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit c61e919ec2211b58f2090e0e0c2ec60804fa2044 Merge: a040b0589 6fc47062a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 07:57:18 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1
by nickm＠torproject.org 14 Sep '17

14 Sep '17

commit 6fc47062affef5653eae59dbe220f86da81f57ff Merge: eb078a3bd 361014255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 14 07:57:14 2017 -0400 Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1 changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --cc src/test/test_channelpadding.c index 1c6107a87,bdc61d329..1e9d59931 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@@ -708,11 -559,15 +720,12 @@@ test_channelpadding_consensus(void *arg tt_i64_op(val, OP_LE, 24*60*60*2); done: + free_mock_consensus(); free_fake_channeltls((channel_tls_t*)chan); smartlist_free(connection_array); - smartlist_free(current_md_consensus->routerstatus_list); - smartlist_free(current_ns_consensus->net_params); - tor_free(relay); - tor_free(current_ns_consensus); timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all(); return;

1 0

[atlas/master] Adds DNS names to relay details pages
by irl＠torproject.org 14 Sep '17

14 Sep '17

commit 6a45da633086120a6b8083404f3aefb7dc585b45 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 14 11:37:51 2017 +0100 Adds DNS names to relay details pages --- js/models/relay.js | 1 + templates/details/router.html | 3 +++ 2 files changed, 4 insertions(+) diff --git a/js/models/relay.js b/js/models/relay.js index 5167ca8..62b8d21 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -167,6 +167,7 @@ define([ relay.or_address = relay.or_addresses ? relay.or_addresses[0].split(":")[0] : null; relay.or_port = relay.or_addresses ? relay.or_addresses[0].split(":")[1] : 0; relay.dir_port = relay.dir_address ? relay.dir_address.split(":")[1] : 0; + relay.host_name = relay.host_name ? relay.host_name : null; relay.country = relay.country ? relay.country.toLowerCase() : null; relay.countryname = relay.country ? CountryCodes[relay.country] : null; relay.first_seen = relay.first_seen ? relay.first_seen : null; diff --git a/templates/details/router.html b/templates/details/router.html index 467b606..a472a50 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -120,6 +120,9 @@ <%=propertyCount==0?'none':''%> </dd> + <dt>DNS Name</dt> + <dd><% if (relay.get('host_name')) { %><%= relay.get('host_name') %><% } else { %>No PTR record found<% } %></dd> + <dt>Country</dt> <dd><% if (relay.get('country')) { %><img class="inline country" title="<%= relay.get('countryname') %>" alt="" src="img/cc/<%= relay.get('country') %>.png"/> <%= relay.get('countryname') %><% } else { %>Unknown<% } %></dd>

1 0

[atlas/master] Move family and platform to the configuration column, make the boxes scroll
by irl＠torproject.org 14 Sep '17

14 Sep '17

commit 5d14a78463fb640efbafeea3a99a68307fb4b19f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 14 11:22:00 2017 +0100 Move family and platform to the configuration column, make the boxes scroll Closes: #22146 --- templates/details/router.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/details/router.html b/templates/details/router.html index 9195f4c..467b606 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -59,6 +59,21 @@ </dd> </dl> + <dt>Effective Family Members</dt> + <dd> + <pre class="pre-scrollable"><% if (relay.get('effective_family') !== null) { %><% _.each(relay.get('effective_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> +<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>"><% } %><%= member %><% if (valid) { %></a><% }}); %> +<% } else { %>none<% } %></pre> + </dd> + <dt>Alleged Family Members</dt> + <dd> + <pre class="pre-scrollable"><% if (relay.get('alleged_family') !== null) { %><% _.each(relay.get('alleged_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> +<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" class="alleged"><% } %><%= member %><% if (valid) { %></a><% }}); %> +<% } else { %>none<% } %></pre> + </dd> + + <dt>Platform</dt> + <dd><%= _.escape(relay.get('platform')) %></dd> </div> <div class="span6"> @@ -120,21 +135,6 @@ <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd> - <dt>Effective Family Members</dt> - <dd> - <pre><% if (relay.get('effective_family') !== null) { %><% _.each(relay.get('effective_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> -<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>"><% } %><%= member %><% if (valid) { %></a><% }}); %> -<% } else { %>none<% } %></pre> - </dd> - <dt>Alleged Family Members</dt> - <dd> - <pre><% if (relay.get('alleged_family') !== null) { %><% _.each(relay.get('alleged_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> -<% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" class="alleged"><% } %><%= member %><% if (valid) { %></a><% }}); %> -<% } else { %>none<% } %></pre> - </dd> - - <dt>Platform</dt> - <dd><%= _.escape(relay.get('platform')) %></dd> <dt><span class="tip" title="Weight assigned to this relay by the directory authorities that clients use in their path selection algorithm. The unit is arbitrary; currently it's kilobytes per second, but that might change in the future.">Consensus Weight</dt> <dd><%= relay.get('consensus_weight') %></dd>

1 0

[atlas/master] Adds "first seen" to the details pages for relays and bridges
by irl＠torproject.org 14 Sep '17

14 Sep '17

commit 094c63b9866409a34fbf3303c07a81d09b8ba60a Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 14 11:11:59 2017 +0100 Adds "first seen" to the details pages for relays and bridges Closes: #21958 --- js/models/relay.js | 1 + templates/details/bridge.html | 3 +++ templates/details/router.html | 3 +++ 3 files changed, 7 insertions(+) diff --git a/js/models/relay.js b/js/models/relay.js index 8550d2d..5167ca8 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -169,6 +169,7 @@ define([ relay.dir_port = relay.dir_address ? relay.dir_address.split(":")[1] : 0; relay.country = relay.country ? relay.country.toLowerCase() : null; relay.countryname = relay.country ? CountryCodes[relay.country] : null; + relay.first_seen = relay.first_seen ? relay.first_seen : null; relay.uptime = relay.last_restarted ? model.parsedate(relay.last_restarted) : null; relay.uptime_hr = relay.last_restarted ? relay.uptime.hr : null; relay.uptime_hrfull = relay.last_restarted ? relay.uptime.hrfull : null; diff --git a/templates/details/bridge.html b/templates/details/bridge.html index 8c9b1b4..f700d5a 100644 --- a/templates/details/bridge.html +++ b/templates/details/bridge.html @@ -73,6 +73,9 @@ <%=propertyCount==0?'none':''%> </dd> + <dt>First Seen</dt> + <dd><%= relay.get('first_seen') %></dd> + <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd> diff --git a/templates/details/router.html b/templates/details/router.html index f0f3105..9195f4c 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -114,6 +114,9 @@ <dt>AS Name</dt> <dd><%= relay.get('as_name') ? _.escape(relay.get('as_name')) : "unknown" %></dd> + <dt>First Seen</dt> + <dd><%= relay.get('first_seen') %></dd> + <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd>

1 0

[atlas/master] Adds the NoEdConsensus flag to the supported flags
by irl＠torproject.org 14 Sep '17

14 Sep '17

commit 264c8601373585b1630b40c0300f819767cba51c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 14 11:02:04 2017 +0100 Adds the NoEdConsensus flag to the supported flags Uses the question mark icon, resolves #21636 --- js/models/relay.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index 1cd4f74..8550d2d 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -32,11 +32,9 @@ define([ if (flag == "Named") { output.push([flag,"info_"+size[2], "This relay's identity-nickname mapping is canonical, and this authority binds names."]); } - /* added for future use, but we need an icon... if (flag == "NoEdConsensus") { - output.push([flag,"xxx_"+size[2], "An Ed25519 key in the relay's descriptor or microdesriptor does not reflect authority consensus."]); + output.push([flag,"question_mark_"+size[2], "An Ed25519 key in the relay's descriptor or microdesriptor does not reflect authority consensus."]); } - */ if (flag == "Running") { output.push([flag,"fork_"+size[1], "This relay is currently usable."]); }

1 0

[metrics-web/master] Start using new Tor Metrics logo in the banner.
by karsten＠torproject.org 14 Sep '17

14 Sep '17

commit 99375e149978881c0012d1f8fba5c0290fff1a0a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 13 15:11:45 2017 +0200 Start using new Tor Metrics logo in the banner. The new logo was put together by antonela, and the style changes come from Raphael Bergmann. Thanks a lot! Implements part of #23383 (without updating *tile.png files). --- website/src/main/resources/web/WEB-INF/top.jsp | 5 ++--- website/src/main/resources/web/css/style.css | 20 ++++++-------------- .../src/main/resources/web/images/metrics-logo.png | Bin 41165 -> 0 bytes .../resources/web/images/metrics-wordmark-white.png | Bin 12343 -> 0 bytes .../main/resources/web/images/tor-metrics-white.png | Bin 0 -> 4700 bytes .../resources/web/images/tor-metrics-white(a)2x.png | Bin 0 -> 10874 bytes 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/website/src/main/resources/web/WEB-INF/top.jsp b/website/src/main/resources/web/WEB-INF/top.jsp index 86ac85f..c013780 100644 --- a/website/src/main/resources/web/WEB-INF/top.jsp +++ b/website/src/main/resources/web/WEB-INF/top.jsp @@ -69,7 +69,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"> </label> - <a class="navbar-brand visible-xs" href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics"></a> + <a class="navbar-brand visible-xs" href="/"><img src="images/tor-metrics-white.png" width="232" height="50" alt="Tor Metrics"></a> </div>  @@ -102,8 +102,7 @@ document.write('<div class="topButton" style="display:none;"><a href="#top"> <div class="page-header hidden-xs"> - <a href="/"><img src="images/metrics-logo.png" width="102" height="133" alt="" id="metrics-logo"></a> - <a href="/"><img src="images/metrics-wordmark-white.png" width="384" height="50" alt="Tor Metrics" id="metrics-wordmark"></a> + <a href="/"><img src="images/tor-metrics-white(a)2x.png" width="232" height="50" alt="Tor Metrics" id="metrics-wordmark"></a> <div> “Tor metrics are the ammunition that lets Tor and other security advocates argue for a more private and secure Internet from a position of data, rather than just dogma or perspective.” — Bruce Schneier (June 1, 2016) diff --git a/website/src/main/resources/web/css/style.css b/website/src/main/resources/web/css/style.css index 6d39105..6770c84 100644 --- a/website/src/main/resources/web/css/style.css +++ b/website/src/main/resources/web/css/style.css @@ -33,10 +33,6 @@ body #wrapper { max-width:40%; height:auto; } -.page-header img#metrics-wordmark { - position:relative; - top:-3px; -} .page-header div { text-align:right; position:absolute; @@ -67,7 +63,7 @@ body #wrapper { display:none; } } -@media (max-height:800px) { +@media (max-height:799.99999px) { /* make page header smaller on e.g. 10 inch notebooks etc. */ .page-header { padding: 0em 2.0em 2.0em 2.0em; @@ -89,6 +85,11 @@ body #wrapper { margin-bottom: 0px !important; } } +@media (min-height:800px) and (min-width: 768px) { + .page-header { + padding-top:70px; + } +} @media (max-height:800px) and (max-width: 1199.99999px) { .page-header div { max-width:330px; @@ -238,15 +239,6 @@ blockquote:before { /* logo size */ -.navbar-header { - background-image: url(../images/metrics-logo.png); - background-position:left center; - background-repeat:no-repeat; - background-size:contain; -} -.navbar-brand { - padding-left:50px; -} .navbar-brand img { height:20px; width:auto; diff --git a/website/src/main/resources/web/images/metrics-logo.png b/website/src/main/resources/web/images/metrics-logo.png deleted file mode 100644 index 7f236d6..0000000 Binary files a/website/src/main/resources/web/images/metrics-logo.png and /dev/null differ diff --git a/website/src/main/resources/web/images/metrics-wordmark-white.png b/website/src/main/resources/web/images/metrics-wordmark-white.png deleted file mode 100644 index f5d98f2..0000000 Binary files a/website/src/main/resources/web/images/metrics-wordmark-white.png and /dev/null differ diff --git a/website/src/main/resources/web/images/tor-metrics-white.png b/website/src/main/resources/web/images/tor-metrics-white.png new file mode 100644 index 0000000..9140ec1 Binary files /dev/null and b/website/src/main/resources/web/images/tor-metrics-white.png differ diff --git a/website/src/main/resources/web/images/tor-metrics-white(a)2x.png b/website/src/main/resources/web/images/tor-metrics-white(a)2x.png new file mode 100644 index 0000000..073337a Binary files /dev/null and b/website/src/main/resources/web/images/tor-metrics-white(a)2x.png differ

1 0

[metrics-web/master] Start using new Tor Metrics logo in the icons.
by karsten＠torproject.org 14 Sep '17

14 Sep '17

commit 0173303362529409b93ce4eb406e6f6431669806 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 14 11:05:07 2017 +0200 Start using new Tor Metrics logo in the icons. The new logo was put together by antonela. Thanks a lot! Implements the rest of #23383. --- .../src/main/resources/web/images/android-icon.png | Bin 21630 -> 19049 bytes .../web/images/apple-touch-icon-152x152.png | Bin 15346 -> 19049 bytes website/src/main/resources/web/images/largetile.png | Bin 37140 -> 19049 bytes .../src/main/resources/web/images/mediumtile.png | Bin 15037 -> 19049 bytes website/src/main/resources/web/images/smalltile.png | Bin 4979 -> 19049 bytes website/src/main/resources/web/images/widetile.png | Bin 25074 -> 9857 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/website/src/main/resources/web/images/android-icon.png b/website/src/main/resources/web/images/android-icon.png index 9ac8ee6..0aeb868 100644 Binary files a/website/src/main/resources/web/images/android-icon.png and b/website/src/main/resources/web/images/android-icon.png differ diff --git a/website/src/main/resources/web/images/apple-touch-icon-152x152.png b/website/src/main/resources/web/images/apple-touch-icon-152x152.png index e705c7f..0aeb868 100644 Binary files a/website/src/main/resources/web/images/apple-touch-icon-152x152.png and b/website/src/main/resources/web/images/apple-touch-icon-152x152.png differ diff --git a/website/src/main/resources/web/images/largetile.png b/website/src/main/resources/web/images/largetile.png index 3bbc32b..0aeb868 100644 Binary files a/website/src/main/resources/web/images/largetile.png and b/website/src/main/resources/web/images/largetile.png differ diff --git a/website/src/main/resources/web/images/mediumtile.png b/website/src/main/resources/web/images/mediumtile.png index ab60681..0aeb868 100644 Binary files a/website/src/main/resources/web/images/mediumtile.png and b/website/src/main/resources/web/images/mediumtile.png differ diff --git a/website/src/main/resources/web/images/smalltile.png b/website/src/main/resources/web/images/smalltile.png index d8b8adc..0aeb868 100644 Binary files a/website/src/main/resources/web/images/smalltile.png and b/website/src/main/resources/web/images/smalltile.png differ diff --git a/website/src/main/resources/web/images/widetile.png b/website/src/main/resources/web/images/widetile.png index f4d644b..a52f09e 100644 Binary files a/website/src/main/resources/web/images/widetile.png and b/website/src/main/resources/web/images/widetile.png differ

1 0

[metrics-web/master] Update news.json to version 129 of doc/MetricsTimeline.
by karsten＠torproject.org 14 Sep '17

14 Sep '17

commit d32530047b29f16406b05fe3f439c2f7b546d173 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Sep 14 11:16:43 2017 +0200 Update news.json to version 129 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index bfa3819..d28816d 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -1580,7 +1580,8 @@ ], "description": "Short-lived, simultaneous spike in direct users in Egypt and Turkey. Bridge users not affected.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">relay graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">eg graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-07-0…">tr graph</a>" ], "unknown": true }

1 0