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

[tor-launcher/master] Bug #10147: Adblock Plus interferes w/Tor Launcher dialog
by brade＠torproject.org 09 Dec '13

09 Dec '13

commit 4bbb3e86f314e793f5939ec70993fe9433048b66 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Dec 9 15:07:24 2013 -0500 Bug #10147: Adblock Plus interferes w/Tor Launcher dialog During progress window init, check the status of the Tor bootstrap process and close the progress window immediately if bootstrapping is complete or if an error has occurred. --- src/chrome/content/progress.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 6a826e0..8a2f427 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -21,6 +21,21 @@ var gOpenerCallbackFunc; // Set when opened from network settings. function initDialog() { + // If tor bootstrap has already finished, just close the progress dialog. + // This situation can occur if bootstrapping is very fast and/or if this + // window opens slowly (observed with Adblock Plus installed). + try + { + var processSvc = Cc["@torproject.org/torlauncher-process-service;1"] + .getService(Ci.nsISupports).wrappedJSObject; + if (processSvc.TorIsBootstrapDone || processSvc.TorBootstrapErrorOccurred) + { + closeThisWindow(processSvc.TorIsBootstrapDone); + return; + } + } + catch (e) { dump(e + "\n"); } + try { gObsSvc = Cc["@mozilla.org/observer-service;1"]

1 0

r26461: {website} Replace link to relay-search service with links to Atlas/Glo (website/trunk/docs/en)
by Karsten Loesing 09 Dec '13

09 Dec '13

Author: kloesing Date: 2013-12-09 16:58:26 +0000 (Mon, 09 Dec 2013) New Revision: 26461 Modified: website/trunk/docs/en/tor-relay-debian.wml Log: Replace link to relay-search service with links to Atlas/Globe. Modified: website/trunk/docs/en/tor-relay-debian.wml =================================================================== --- website/trunk/docs/en/tor-relay-debian.wml 2013-12-07 13:59:06 UTC (rev 26460) +++ website/trunk/docs/en/tor-relay-debian.wml 2013-12-09 16:58:26 UTC (rev 26461) @@ -92,9 +92,10 @@ <p>When it decides that it's reachable, it will upload a "server descriptor" to the directory authorities, to let clients know what address, ports, keys, etc your relay is using. After a few - hours (to give it enough time to propagate), you can <a - href="https://metrics.torproject.org/relay-search.html">search the - relay database</a> to see whether it's there.</p> + hours (to give it enough time to propagate), you can query + <a href="https://atlas.torproject.org/">Atlas</a> or + <a href="https://globe.torproject.org/">Globe</a> to see whether your + relay has successfully registered in the network.</p> <hr> <a id="after"></a>

1 0

[tor/master] Fix get_configured_bridge_by_addr_port_digest(., ., NULL)
by nickm＠torproject.org 09 Dec '13

09 Dec '13

commit e6590efaa77c8cf186ce92e6ebad175e9c6450d1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Dec 8 20:42:33 2013 +0200 Fix get_configured_bridge_by_addr_port_digest(.,.,NULL) The old behavior was that NULL matched only bridges without known identities; the correct behavior is that NULL should match all bridges (assuming that their addr:port matches). --- changes/bug9162 | 6 ++++++ src/or/entrynodes.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug9162 b/changes/bug9162 new file mode 100644 index 0000000..c1a247a --- /dev/null +++ b/changes/bug9162 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Fix a get_configured_bridge_by_addr_port_digest() function so + that it would return a bridge with given address and port even + if bridge digest is not specified by caller. Fixes bug 9162; + bugfix on 0.2.0.3-alpha. Based on a patch from "rl1987". + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ebbd85c..d463303 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1657,7 +1657,8 @@ get_configured_bridge_by_orports_digest(const char *digest, /** If we have a bridge configured whose digest matches <b>digest</b>, or a * bridge with no known digest whose address matches <b>addr</b>:<b>/port</b>, - * return that bridge. Else return NULL. */ + * return that bridge. Else return NULL. If <b>digest</b> is NULL, check for + * address/port matches only. */ static bridge_info_t * get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, uint16_t port, @@ -1667,7 +1668,7 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, return NULL; SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { - if (tor_digest_is_zero(bridge->identity) && + if ((tor_digest_is_zero(bridge->identity) || digest == NULL) && !tor_addr_compare(&bridge->addr, addr, CMP_EXACT) && bridge->port == port) return bridge;

1 0

[tor/master] Remove a check in channeltls.c that could never fail.
by nickm＠torproject.org 09 Dec '13

09 Dec '13

commit c56bb300447688788cb4c78c0290bc95386e63d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 11:02:34 2013 -0500 Remove a check in channeltls.c that could never fail. We were checking whether a 8-bit length field had overflowed a 503-byte buffer. Unless somebody has found a way to store "504" in a single byte, it seems unlikely. Fix for 10313 and 9980. Based on a pach by Jared L Wong. First found by David Fifield with STACK. --- changes/bug10313 | 8 ++++++++ src/or/channeltls.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/changes/bug10313 b/changes/bug10313 new file mode 100644 index 0000000..b29d4da --- /dev/null +++ b/changes/bug10313 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Fixed an erroneous pointer comparison that would have allowed + compilers to remove a bounds check in channeltls.c. The fix + was to remove the check entirely, since it was impossible for + the code to overflow the bounds. Noticed by Jared L + Wong. Fixes bug 10313 and 9980. Bugfix on 0.2.0.10-alpha. + + diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f751c0d..e622f2f 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1408,12 +1408,14 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) my_addr_ptr = (uint8_t*) cell->payload + 6; end = cell->payload + CELL_PAYLOAD_SIZE; cp = cell->payload + 6 + my_addr_len; - if (cp >= end) { - log_fn(LOG_PROTOCOL_WARN, LD_OR, - "Addresses too long in netinfo cell; closing connection."); - connection_or_close_for_error(chan->conn, 0); - return; - } else if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) { + + /* We used to check: + * if (my_addr_len >= CELL_PAYLOAD_SIZE - 6) { + * + * This is actually never going to happen, since my_addr_len is at most 255, + * and CELL_PAYLOAD_LEN - 6 is 503. So we know that cp is < end. */ + + if (my_addr_type == RESOLVED_TYPE_IPV4 && my_addr_len == 4) { tor_addr_from_ipv4n(&my_apparent_addr, get_uint32(my_addr_ptr)); } else if (my_addr_type == RESOLVED_TYPE_IPV6 && my_addr_len == 16) { tor_addr_from_ipv6_bytes(&my_apparent_addr, (const char *) my_addr_ptr);

1 0

[tor/master] Merge remote-tracking branch 'public/bug10131_024'
by nickm＠torproject.org 09 Dec '13

09 Dec '13

commit 9c048d90b6b17f6d54fd8adfbe301db6e98d6142 Merge: b600495 c56bb30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 11:06:20 2013 -0500 Merge remote-tracking branch 'public/bug10131_024' changes/bug10313 | 8 ++++++++ src/or/channeltls.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-)

1 0

[metrics-web/master] Add a few horizontal lines.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit b001cbbcf7ea8c7c039850dfb160e7717508bbd3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 15:57:29 2013 +0100 Add a few horizontal lines. --- web/WEB-INF/stats.jsp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/web/WEB-INF/stats.jsp b/web/WEB-INF/stats.jsp index 44653eb..ccc2540 100644 --- a/web/WEB-INF/stats.jsp +++ b/web/WEB-INF/stats.jsp @@ -20,7 +20,8 @@ All aggregated data are also available for download, so that people can easily plot their own graphs or even develop a prettier metrics website without writing their own data aggregation code. Data formats of aggregate statistics are specified below.</p> - +<hr> +<br> <a name="servers"></a> <h3><a href="#servers" class="anchor">Number of relays and @@ -86,6 +87,8 @@ the previous columns. If the values in previous columns are specific to relays only, this column contains the empty string.</li> </ul> +<hr> +<br> <a name="bandwidth"></a> <h3><a href="#bandwidth" class="anchor">Bandwidth provided and consumed by @@ -130,6 +133,8 @@ flags, so that this column will contain the empty string if either <li><b>dirwrite:</b> Similar to <b>dirread</b>, but for traffic written by relays when serving directory data.</li> </ul> +<hr> +<br> <a name="fast-exits"></a> <h3><a href="#fast-exits" class="anchor">Relays meeting or almost meeting @@ -166,6 +171,8 @@ fast-exit requirements.</li> matching fast-exit requirements.</li> </li> </ul> +<hr> +<br> <a name="clients"></a> <h3><a href="#clients" class="anchor">Estimated number of clients in the @@ -224,6 +231,8 @@ The higher this value, the more reliable is the estimate. Values above 50 can be considered reliable enough for most purposes, lower values should be handled with more care.</li> </ul> +<hr> +<br> <a name="torperf"></a> <h3><a href="#torperf" class="anchor">Performance of downloading static @@ -256,6 +265,8 @@ download the static file over Tor.</li> <li><b>requests:</b> Total number of requests made to download the static file over Tor.</li> </ul> +<hr> +<br> <a name="connbidirect"></a> <h3><a href="#connbidirect" class="anchor">Fraction of connections used

1 0

[metrics-web/master] Change CSV links to new stats/* files.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit 6e4af910bd7120198e68a76ce9d84f7f16f61d90 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 15:51:06 2013 +0100 Change CSV links to new stats/* files. --- web/WEB-INF/network.jsp | 18 +++++++++--------- web/WEB-INF/performance.jsp | 6 +++--- web/WEB-INF/users.jsp | 6 +----- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 9d286c9..e0b297a 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -41,7 +41,7 @@ bridges in the network.</p> <p>Download graph as <a href="networksize.pdf${networksize_url}">PDF</a> or <a href="networksize.svg${networksize_url}">SVG</a>.</p> -<p><a href="csv/networksize.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="relayflags"></a> @@ -79,7 +79,7 @@ average number of relays with these flags assigned.</p> <p>Download graph as <a href="relayflags.pdf${relayflags_url}">PDF</a> or <a href="relayflags.svg${relayflags_url}">SVG</a>.</p> -<p><a href="csv/relayflags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="versions"></a> @@ -112,7 +112,7 @@ The following graph shows the number of relays by version.</p> <p>Download graph as <a href="versions.pdf${versions_url}">PDF</a> or <a href="versions.svg${versions_url}">SVG</a>.</p> -<p><a href="csv/versions.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="platforms"></a> @@ -141,7 +141,7 @@ platform.</p> <p>Download graph as <a href="platforms.pdf${platforms_url}">PDF</a> or <a href="platforms.svg${platforms_url}">SVG</a>.</p> -<p><a href="csv/platforms.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="cloudbridges"></a> @@ -170,7 +170,7 @@ network.</p> <p>Download graph as <a href="cloudbridges.pdf${cloudbridges_url}">PDF</a> or <a href="cloudbridges.svg${cloudbridges_url}">SVG</a>.</p> -<p><a href="csv/cloudbridges.csv">CSV</a> file containing all data.</p> +<p><a href="stats/servers.csv">CSV</a> file containing all data.</p> <br> <a name="bandwidth"></a> @@ -201,7 +201,7 @@ in the network.</p> <p>Download graph as <a href="bandwidth.pdf${bandwidth_url}">PDF</a> or <a href="bandwidth.svg${bandwidth_url}">SVG</a>.</p> -<p><a href="csv/bandwidth.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="bwhist-flags"></a> @@ -230,7 +230,7 @@ Exit and/or Guard flags assigned by the directory authorities.</p> <p>Download graph as <a href="bwhist-flags.pdf${bwhist_flags_url}">PDF</a> or <a href="bwhist-flags.svg${bwhist_flags_url}">SVG</a>.</p> -<p><a href="csv/bwhist-flags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="bandwidth-flags"></a> @@ -262,7 +262,7 @@ Guard flag.</p> <p>Download graph as <a href="bandwidth-flags.pdf${bandwidth_flags_url}">PDF</a> or <a href="bandwidth-flags.svg${bandwidth_flags_url}">SVG</a>.</p> -<p><a href="csv/bandwidth-flags.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> <a name="dirbytes"></a> @@ -294,7 +294,7 @@ the number of written and read dir bytes by all relays.</p> <p>Download graph as <a href="dirbytes.pdf${dirbytes_url}">PDF</a> or <a href="dirbytes.svg${dirbytes_url}">SVG</a>.</p> -<p><a href="csv/dirbytes.csv">CSV</a> file containing all data.</p> +<p><a href="stats/bandwidth.csv">CSV</a> file containing all data.</p> <br> </div> </div> diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index d41232f..e220b59 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -56,7 +56,7 @@ graph.</p> <p>Download graph as <a href="torperf.pdf${torperf_url}">PDF</a> or <a href="torperf.svg${torperf_url}">SVG</a>.</p> -<p><a href="csv/torperf.csv">CSV</a> file containing all data.</p> +<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p> <br> <a name="torperf-failures"></a> @@ -100,7 +100,7 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p>Download graph as <a href="torperf-failures.pdf${torperf_failures_url}">PDF</a> or <a href="torperf-failures.svg${torperf_failures_url}">SVG</a>.</p> -<p><a href="csv/torperf-failures.csv">CSV</a> file containing all data.</p> +<p><a href="stats/torperf.csv">CSV</a> file containing all data.</p> <br> <a name="connbidirect"></a> @@ -138,7 +138,7 @@ classifying connections, read and write counters are reset for the next <p>Download graph as <a href="connbidirect.pdf${connbidirect_url}">PDF</a> or <a href="connbidirect.svg${connbidirect_url}">SVG</a>.</p> -<p><a href="csv/connbidirect.csv">CSV</a> file containing all data.</p> +<p><a href="stats/connbidirect.csv">CSV</a> file containing all data.</p> <br> </div> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 788b3a8..45ecdee 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -247,12 +247,8 @@ <a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>.</p> <hr> -<p><a href="csv/userstats.csv">CSV</a> file containing new user +<p><a href="stats/clients.csv">CSV</a> file containing new user estimates.</p> -<p><a href="csv/monthly-userstats-peak.csv">CSV</a> file containing peak -daily Tor users (direct and bridge) per month by country.</p> -<p><a href="csv/monthly-userstats-average.csv">CSV</a> file containing -average daily Tor users (direct and bridge) per month by country.</p> <br> <hr>

1 0

[metrics-web/master] Add anchors to stats.html.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit 5976c5987b4ae2880a3e908f8da39a781d7d8492 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 14:28:35 2013 +0100 Add anchors to stats.html. --- web/WEB-INF/stats.jsp | 60 ++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/web/WEB-INF/stats.jsp b/web/WEB-INF/stats.jsp index eac4b57..44653eb 100644 --- a/web/WEB-INF/stats.jsp +++ b/web/WEB-INF/stats.jsp @@ -21,8 +21,11 @@ easily plot their own graphs or even develop a prettier metrics website without writing their own data aggregation code. Data formats of aggregate statistics are specified below.</p> -<h3>Number of relays and bridges</h3> +<a name="servers"></a> +<h3><a href="#servers" class="anchor">Number of relays and +bridges</a></h3> +<br> <p>Statistics file <a href="stats/servers.csv">servers.csv</a> contains the average number of relays and bridges in the Tor network. All averages are calculated per day by evaluating the relay and bridge @@ -84,10 +87,12 @@ If the values in previous columns are specific to relays only, this column contains the empty string.</li> </ul> -<h3>Bandwidth provided and consumed by relays</h3> - -Statistics on bandwidth provided and consumed by relays are contained in -file <a href="stats/bandwidth.csv">bandwidth.csv</a>. +<a name="bandwidth"></a> +<h3><a href="#bandwidth" class="anchor">Bandwidth provided and consumed by +relays</a></h3> +<br> +<p>Statistics on bandwidth provided and consumed by relays are contained +in file <a href="stats/bandwidth.csv">bandwidth.csv</a>. This file contains three different bandwidth metrics: (1) bandwidth that relays are capable to provide and bandwidth that relays report to have consumed, either (2) for any traffic, or (3) only traffic @@ -95,7 +100,7 @@ from serving directory data. Relays providing bandwidth statistics are categorized by having the <b>"Exit"</b> and <b>"Guard"</b> relay flag, having both, or not having either. -The statistics file contains the following columns: +The statistics file contains the following columns:</p> <ul> <li><b>date:</b> UTC date (YYYY-MM-DD) that relays reported bandwidth data @@ -126,10 +131,13 @@ flags, so that this column will contain the empty string if either relays when serving directory data.</li> </ul> -<h3>Relays meeting or almost meeting fast-exit requirements</h3> - -Statistics file <a href="stats/fast-exits.csv">fast-exits.csv</a> contains -the number of relays meeting or almost meeting fast-exit requirements. +<a name="fast-exits"></a> +<h3><a href="#fast-exits" class="anchor">Relays meeting or almost meeting +fast-exit requirements</a></h3> +<br> +<p>Statistics file <a href="stats/fast-exits.csv">fast-exits.csv</a> +contains the number of relays meeting or almost meeting fast-exit +requirements. These requirements originate from a Tor sponsor contract and are defined as follows: a Tor relay is fast if it has at least 95 Mbit/s configured bandwidth @@ -143,7 +151,7 @@ configured bandwidth rate, at least 2000 KB/s advertised bandwidth capacity, and permits exiting to ports 80 and 443; also, if there are more than 2 relays per /24 network meeting fast-exit requirements, all but two are considered almost fast. -The statistics file contains the following columns: +The statistics file contains the following columns:</p> <ul> <li><b>date:</b> UTC date (YYYY-MM-DD) when relays have been listed as @@ -159,9 +167,11 @@ matching fast-exit requirements.</li> </li> </ul> -<h3>Estimated number of clients in the Tor network</h3> - -Statistics file <a href="stats/clients.csv">clients.csv</a> contains +<a name="clients"></a> +<h3><a href="#clients" class="anchor">Estimated number of clients in the +Tor network</a></h3> +<br> +<p>Statistics file <a href="stats/clients.csv">clients.csv</a> contains estimates on the number of clients in the Tor network. These estimates are based on the number of directory requests counted on directory mirrors and bridges. @@ -172,7 +182,7 @@ and for bridges, statistics are available by country, by transport, and by IP version. Statistics further include expected client numbers from past observations which can be used to detect censorship or release of censorship. -The statistics file contains the following columns: +The statistics file contains the following columns:</p> <ul> <li><b>date:</b> UTC date (YYYY-MM-DD) for which client numbers are @@ -215,13 +225,15 @@ Values above 50 can be considered reliable enough for most purposes, lower values should be handled with more care.</li> </ul> -<h3>Performance of downloading static files over Tor</h3> - -Statistics file <a href="stats/torperf.csv">torperf.csv</a> contains +<a name="torperf"></a> +<h3><a href="#torperf" class="anchor">Performance of downloading static +files over Tor</a></h3> +<br> +<p>Statistics file <a href="stats/torperf.csv">torperf.csv</a> contains aggregate statistics on download performance over time. These statistics come from the Torperf service that periodically downloads static files over Tor. -The statistics file contains the following columns: +The statistics file contains the following columns:</p> <ul> <li><b>date:</b> UTC date (YYYY-MM-DD) when download performance was @@ -245,9 +257,11 @@ download the static file over Tor.</li> file over Tor.</li> </ul> -<h3>Fraction of connections used uni-/bidirectionally</h3> - -Statistics file <a href="stats/connbidirect.csv">connbidirect.csv</a> +<a name="connbidirect"></a> +<h3><a href="#connbidirect" class="anchor">Fraction of connections used +uni-/bidirectionally</a></h3> +<br> +<p>Statistics file <a href="stats/connbidirect.csv">connbidirect.csv</a> contains statistics on the fraction of connections that is used uni- or bidirectionally. Every 10 seconds, relays determine for every connection whether they read @@ -260,7 +274,7 @@ All other connections are classified as "both reading and writing." After classifying connections, read and write counters are reset for the next 10-second interval. Statistics are aggregated over 24 hours. -The statistics file contains the following columns: +The statistics file contains the following columns:</p> <ul> <li><b>date:</b> UTC date (YYYY-MM-DD) for which statistics on

1 0

[metrics-web/master] Remove links from network.html.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit eb77c33fcd2f51c5eeca4a2401a12e30b92d44ad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 15:38:57 2013 +0100 Remove links from network.html. Looks like http://tigerpa.ws/tor_metrics/ is dead, and no need to link to bubbles.html which is also available via the navigation bar. --- web/WEB-INF/network.jsp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index fe1b7b8..9d286c9 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -15,15 +15,6 @@ <div class="main-column"> <h2>Tor Metrics Portal: Network</h2> <br> -<a name="interactive"></a> -<h3><a href="#interactive" class="anchor">Interactive graphs of relays in -the network</a></h3> -<br> -<p>Most of the statistics on this page are also available as -<a href="http://tigerpa.ws/tor_metrics/">interactive graphs</a>.</p> -<br> -<p>Top relays as <a href="bubbles.html">bubble graphs</a>.</p> - <a name="networksize"></a> <h3><a href="#networksize" class="anchor">Relays and bridges in the network</a></h3>

1 0

[metrics-web/master] Don't set Last-Modified header on stats.html response.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit 02597bad1fc06194ae1da6a22da26f3f6397a40a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 15:33:14 2013 +0100 Don't set Last-Modified header on stats.html response. --- src/org/torproject/ernie/web/research/ResearchStatsServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/ernie/web/research/ResearchStatsServlet.java b/src/org/torproject/ernie/web/research/ResearchStatsServlet.java index ab1c231..2ca93a3 100644 --- a/src/org/torproject/ernie/web/research/ResearchStatsServlet.java +++ b/src/org/torproject/ernie/web/research/ResearchStatsServlet.java @@ -39,7 +39,7 @@ public class ResearchStatsServlet extends HttpServlet { public long getLastModified(HttpServletRequest request) { File statsFile = this.determineStatsFile(request); if (statsFile == null || !statsFile.exists()) { - return 0L; + return -1L; } else { return statsFile.lastModified(); }

1 0