January 2018 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 10 Jan '18

10 Jan '18

commit d3a6b3b4e2f3dcc3b157c1198a1609751e38a848 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 10 18:16:01 2018 +0000 Update translations for tails-persistence-setup --- eo/eo.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/eo.po b/eo/eo.po index 799859002..bf3dae4a7 100644 --- a/eo/eo.po +++ b/eo/eo.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2018-01-10 18:03+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Stop invoking undefined behaviour by using tor_free() on an unaligned pointer
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit 54899b404cbde5a24984e4865eed112f303398f6 Author: teor <teor2345(a)gmail.com> Date: Sun Dec 24 22:36:52 2017 +1100 Stop invoking undefined behaviour by using tor_free() on an unaligned pointer ... in get_interface_addresses_ioctl(). This pointer alignment issue exists on x86_64 macOS, but is unlikely to exist elsewhere. (i386 macOS only requires 4-byte alignment, and other OSs have 8-byte ints.) Fixes bug 24733; not in any released version of tor. --- changes/bug24733 | 6 ++++++ src/common/address.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/bug24733 b/changes/bug24733 new file mode 100644 index 000000000..e333e4fa5 --- /dev/null +++ b/changes/bug24733 @@ -0,0 +1,6 @@ + o Minor bugfixes (code correctness): + - Stop invoking undefined behaviour by using tor_free() on an unaligned + pointer in get_interface_addresses_ioctl(). This pointer alignment issue + exists on x86_64 macOS, but is unlikely to exist elsewhere. + Fixes bug 24733; bugfix on 0.3.0.0-alpha-dev; + not in any released version of tor. diff --git a/src/common/address.c b/src/common/address.c index 0c0ba782a..ea14e6392 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1601,7 +1601,11 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) done: if (fd >= 0) close(fd); - tor_free(ifc.ifc_buf); + /* On macOS, tor_free() loads ifc.ifc_buf, which leads to undefined + * behaviour, because it is always aligned at 8-bytes (ifc) plus 4 bytes + * (ifc_len and pragma pack(4)). So we use raw_free() instead. */ + raw_free(ifc.ifc_buf); + ifc.ifc_buf = NULL; return result; } #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */

1 0

[tor/master] Merge branch 'bug24733_squashed_2'
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit c8c258a4333815e195097a59801397dd7a169828 Merge: ca1d1c382 519fa1a3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 12:57:23 2018 -0500 Merge branch 'bug24733_squashed_2' changes/bug24733 | 6 ++++++ src/common/address.c | 14 +++++++++++++- src/common/util.h | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-)

1 0

[tor/master] Extract the raw_free() of ifc_buf into a new function.
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit f71bbd20a40de78fc1e7d722ba591578f137abec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 09:51:45 2018 -0500 Extract the raw_free() of ifc_buf into a new function. Explain the problem more correctly. --- src/common/address.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index ea14e6392..d96ec514b 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1515,6 +1515,18 @@ get_interface_addresses_win32(int severity, sa_family_t family) #define _SIZEOF_ADDR_IFREQ sizeof #endif +/* Free ifc->ifc_buf safely. */ +static void +ifconf_free_ifc_buf(struct ifconf *ifc) +{ + /* On macOS, tor_free() takes the address of ifc.ifc_buf, which leads to + * undefined behaviour, because pointer-to-pointers are expected to be + * aligned at 8-bytes, but the ifconf structure is packed. So we use + * raw_free() instead. */ + raw_free(ifc->ifc_buf); + ifc->ifc_buf = NULL; +} + /** Convert <b>*buf</b>, an ifreq structure array of size <b>buflen</b>, * into smartlist of <b>tor_addr_t</b> structures. */ @@ -1601,11 +1613,7 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) done: if (fd >= 0) close(fd); - /* On macOS, tor_free() loads ifc.ifc_buf, which leads to undefined - * behaviour, because it is always aligned at 8-bytes (ifc) plus 4 bytes - * (ifc_len and pragma pack(4)). So we use raw_free() instead. */ - raw_free(ifc.ifc_buf); - ifc.ifc_buf = NULL; + ifconf_free_ifc_buf(&ifc); return result; } #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */

1 0

[tor/master] Document the alignment limitation of tor_free()
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit 519fa1a3e6943f858b5dc1dee461053af1c187cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 09:55:01 2018 -0500 Document the alignment limitation of tor_free() --- src/common/util.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/util.h b/src/common/util.h index 8dc64ce9f..2ee0ea28c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -79,6 +79,11 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, * * This is a macro. If you need a function pointer to release memory from * tor_malloc(), use tor_free_(). + * + * Note that this macro takes the address of the pointer it is going to + * free and clear. If that pointer is stored with a nonstandard + * alignment (eg because of a "packed" pragma) it is not correct to use + * tor_free(). */ #ifdef __GNUC__ #define tor_free(p) STMT_BEGIN \

1 0

[tor/master] Add some values to OOM log msg #24501
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit ac9eebd63637d39b2a55d9a40c748a197fd47f93 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Wed Dec 20 18:31:30 2017 +0100 Add some values to OOM log msg #24501 Exposing cell_queues_get_total_allocation(), buf_get_total_allocation(), tor_compress_get_total_allocation(), tor_compress_get_total_allocation() when hit MaxMemInQueues threshold. Fixes #24501 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket24501 | 3 +++ src/or/circuitlist.c | 12 +++++++++--- src/or/relay.c | 2 +- src/or/relay.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/ticket24501 b/changes/ticket24501 new file mode 100644 index 000000000..4a87462e9 --- /dev/null +++ b/changes/ticket24501 @@ -0,0 +1,3 @@ + o Minor features (logging): + - Make the log more quantitative when we hit MaxMemInQueues threshold + exposing some values. Closes ticket 24501. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d442887c9..c1b5c1a95 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -2329,9 +2329,15 @@ circuits_handle_oom(size_t current_allocation) int n_circuits_killed=0; int n_dirconns_killed=0; uint32_t now_ms; - log_notice(LD_GENERAL, "We're low on memory. Killing circuits with " - "over-long queues. (This behavior is controlled by " - "MaxMemInQueues.)"); + log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc: %zu," + " buffer total alloc: %zu, tor compress total alloc: %zu," + " rendezvous cache total alloc: %zu). Killing circuits with" + " over-long queues. (This behavior is controlled by" + " MaxMemInQueues.)", + cell_queues_get_total_allocation(), + buf_get_total_allocation(), + tor_compress_get_total_allocation(), + rend_cache_get_total_allocation()); { size_t mem_target = (size_t)(get_options()->MaxMemInQueues * diff --git a/src/or/relay.c b/src/or/relay.c index 09f70793d..952622b6b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2530,7 +2530,7 @@ packed_cell_mem_cost(void) } /* DOCDOC */ -STATIC size_t +size_t cell_queues_get_total_allocation(void) { return total_cells_allocated * packed_cell_mem_cost(); diff --git a/src/or/relay.h b/src/or/relay.h index 2412dcb23..479ce5496 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -17,6 +17,7 @@ extern uint64_t stats_n_relay_cells_delivered; int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, cell_direction_t cell_direction); +size_t cell_queues_get_total_allocation(void); void relay_header_pack(uint8_t *dest, const relay_header_t *src); void relay_header_unpack(relay_header_t *dest, const uint8_t *src); @@ -102,7 +103,6 @@ STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); -STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); #endif /* defined(RELAY_PRIVATE) */

1 0

[tor/master] Merge remote-tracking branch 'ffmancera/github/bug24501'
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit ca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be Merge: d8c0c62c7 ac9eebd63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 12:46:39 2018 -0500 Merge remote-tracking branch 'ffmancera/github/bug24501' changes/ticket24501 | 3 +++ src/or/circuitlist.c | 12 +++++++++--- src/or/relay.c | 2 +- src/or/relay.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --cc src/or/circuitlist.c index f074025a3,c1b5c1a95..661438d8f --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -2403,10 -2328,16 +2403,16 @@@ circuits_handle_oom(size_t current_allo size_t mem_recovered=0; int n_circuits_killed=0; int n_dirconns_killed=0; - uint32_t now_ms; + uint32_t now_ts; - log_notice(LD_GENERAL, "We're low on memory. Killing circuits with " - "over-long queues. (This behavior is controlled by " - "MaxMemInQueues.)"); + log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc: %zu," + " buffer total alloc: %zu, tor compress total alloc: %zu," + " rendezvous cache total alloc: %zu). Killing circuits with" + " over-long queues. (This behavior is controlled by" + " MaxMemInQueues.)", + cell_queues_get_total_allocation(), + buf_get_total_allocation(), + tor_compress_get_total_allocation(), + rend_cache_get_total_allocation()); { size_t mem_target = (size_t)(get_options()->MaxMemInQueues * diff --cc src/or/relay.h index daf789c85,479ce5496..f0fa7e987 --- a/src/or/relay.h +++ b/src/or/relay.h @@@ -113,8 -103,6 +114,7 @@@ STATIC int connection_edge_process_reso const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); +STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue); - STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); #endif /* defined(RELAY_PRIVATE) */

1 0

[metrics-web/master] Update news.json to version 215 of doc/MetricsTimeline.
by karsten＠torproject.org 10 Jan '18

10 Jan '18

commit ab11b5848ea47d5cb0c5c65c47922f7fb431cf4f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 10 17:29:19 2018 +0100 Update news.json to version 215 of doc/MetricsTimeline. As part of this update, support "ongoing" events introduced in version 215. --- src/main/java/org/torproject/metrics/web/News.java | 9 + src/main/resources/web/json/news.json | 498 +++++++++------------ 2 files changed, 210 insertions(+), 297 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/News.java b/src/main/java/org/torproject/metrics/web/News.java index eddb162..53ca7b4 100644 --- a/src/main/java/org/torproject/metrics/web/News.java +++ b/src/main/java/org/torproject/metrics/web/News.java @@ -15,6 +15,8 @@ public class News { private String end; + private boolean ongoing; + private List<String> places; private String[] protocols; @@ -33,6 +35,10 @@ public class News { return this.end; } + boolean getOngoing() { + return this.ongoing; + } + List<String> getPlaces() { return this.places; } @@ -68,6 +74,9 @@ public class News { if (null == this.start) { /* Invalid event without start date. */ sb.append("N/A"); + } else if (this.ongoing) { + /* Ongoing event. */ + sb.append(this.start).append(" to present"); } else if (null == this.end || this.start.equals(this.end)) { /* Single-day event. */ sb.append(this.start); diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index ee3e1cf..8f81364 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -303,6 +303,7 @@ }, { "start": "2012-02-08", + "ongoing": true, "places": [ "ir" ], @@ -1290,19 +1291,10 @@ { "start": "2015-07-29", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"July 8 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 6882B8663F74C23E26E3C2274C24CAB2E82D67A2</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=7004d67430857f8b279bbfe789…">commit</a>" - ] - }, - { - "start": "2015-07-29", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"July 8 2015 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest F063BD5247EB9829E6B9E586393D7036656DAF44</code>).", + "description": "geoip and geoip6 databases updated to \"July 8 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 6882B8663F74C23E26E3C2274C24CAB2E82D67A2</code>, <code>geoip6-db-digest F063BD5247EB9829E6B9E586393D7036656DAF44</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=7004d67430857f8b279bbfe789…">commit</a>" ] @@ -1332,19 +1324,10 @@ { "start": "2015-09-24", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"September 3 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 022B9BADD23D743E51F165FB4C87E78E59F0BCB8</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=8b3e0b772991b5611f06596865…">commit</a>" - ] - }, - { - "start": "2015-09-24", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"September 3 2015 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest DE13219FCF0F27999D1F91174CF80291B1746C95</code>).", + "description": "geoip and geoip6 databases updated to \"September 3 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 022B9BADD23D743E51F165FB4C87E78E59F0BCB8</code>, <code>geoip6-db-digest DE13219FCF0F27999D1F91174CF80291B1746C95</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=8b3e0b772991b5611f06596865…">commit</a>" ] @@ -1382,19 +1365,10 @@ { "start": "2015-10-09", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"October 9 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 5BF366AD4A0572D82A1A0F6628AF8EF7725E3AB9</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=62b02a1941c6c51efe36f804dd…">commit</a>" - ] - }, - { - "start": "2015-10-09", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"October 9 2015 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 212DE17D5A368DCAFA19B95F168BFFA101145A93</code>).", + "description": "geoip and geoip6 databases updated to \"October 9 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 5BF366AD4A0572D82A1A0F6628AF8EF7725E3AB9</code>, <code>geoip6-db-digest 212DE17D5A368DCAFA19B95F168BFFA101145A93</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=62b02a1941c6c51efe36f804dd…">commit</a>" ] @@ -1446,19 +1420,10 @@ { "start": "2015-12-05", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"December 1 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 6346E26E2BC96F8511588CE2695E9B0339A75D32</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=dbb919cf9400738987bbb91166…">commit</a>" - ] - }, - { - "start": "2015-12-05", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"December 1 2015 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 43CCB43DBC653D8CC16396A882C5F116A6004F0C</code>).", + "description": "geoip and geoip6 databases updated to \"December 1 2015 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 6346E26E2BC96F8511588CE2695E9B0339A75D32</code>, <code>geoip6-db-digest 43CCB43DBC653D8CC16396A882C5F116A6004F0C</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=dbb919cf9400738987bbb91166…">commit</a>" ] @@ -1493,19 +1458,10 @@ { "start": "2016-01-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"January 5 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 44FC92E4D3F8C9A3A49EE9A594790C52E684298A</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1496056c121d02193433d98173…">commit</a>" - ] - }, - { - "start": "2016-01-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"January 5 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest BB261912C96611967FE5C1AE2700C965DBB8D61C</code>).", + "description": "geoip and geoip6 databases updated to \"January 5 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 44FC92E4D3F8C9A3A49EE9A594790C52E684298A</code>, <code>geoip6-db-digest BB261912C96611967FE5C1AE2700C965DBB8D61C</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1496056c121d02193433d98173…">commit</a>" ] @@ -1558,19 +1514,10 @@ { "start": "2016-02-04", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"February 2 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 9E16EDBB826B958A7B8B84674EA98B78C13F1177</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=d5ac79e056bdb740adecf45ef3…">commit</a>" - ] - }, - { - "start": "2016-02-04", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"February 2 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest DF9538534517275080F8335DDEE4B879A3314ED4</code>).", + "description": "geoip and geoip6 databases updated to \"February 2 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 9E16EDBB826B958A7B8B84674EA98B78C13F1177</code>, <code>geoip6-db-digest DF9538534517275080F8335DDEE4B879A3314ED4</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=d5ac79e056bdb740adecf45ef3…">commit</a>" ] @@ -1589,19 +1536,10 @@ { "start": "2016-03-04", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"March 3 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest A34F49E5A871FA4D243C46C04B67BB3CAAFE6F74</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=8e2640b15ab72630e0f391a51f…">commit</a>" - ] - }, - { - "start": "2016-03-04", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"March 3 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 9C8C4F7C7612849C88206726FCDA8CB85B8D27F3</code>).", + "description": "geoip and geoip6 databases updated to \"March 3 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest A34F49E5A871FA4D243C46C04B67BB3CAAFE6F74</code>, <code>geoip6-db-digest 9C8C4F7C7612849C88206726FCDA8CB85B8D27F3</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=8e2640b15ab72630e0f391a51f…">commit</a>" ] @@ -1628,19 +1566,10 @@ { "start": "2016-04-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"April 5 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest F9DFB82B6F1A480F07F4B87992CBFB7A48CB8DA2</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=97c6e717b9f3f198163c6d5b4b…">commit</a>" - ] - }, - { - "start": "2016-04-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"April 5 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 769B499E6AE9FE0C2366141B931A3DB1B5489114</code>).", + "description": "geoip and geoip6 databases updated to \"April 5 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest F9DFB82B6F1A480F07F4B87992CBFB7A48CB8DA2</code>, <code>geoip6-db-digest 769B499E6AE9FE0C2366141B931A3DB1B5489114</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=97c6e717b9f3f198163c6d5b4b…">commit</a>" ] @@ -1676,19 +1605,10 @@ { "start": "2016-05-09", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"May 4 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 76631C314A048A59A1D801515CC7FD55CE719499</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=3c2d4611ce52024364bc729a97…">commit</a>" - ] - }, - { - "start": "2016-05-09", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"May 4 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest C9392F0337A7509F1187890925CF7006F884ECBA</code>).", + "description": "geoip and geoip6 databases updated to \"May 4 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 76631C314A048A59A1D801515CC7FD55CE719499</code>, <code>geoip6-db-digest C9392F0337A7509F1187890925CF7006F884ECBA</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=3c2d4611ce52024364bc729a97…">commit</a>" ] @@ -1744,19 +1664,10 @@ { "start": "2016-06-12", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"June 7 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest DA31976A9C7D48C2C16EA70BCE9006772A0F4A34</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=c14c662758e95e85aa251c959c…">commit</a>" - ] - }, - { - "start": "2016-06-12", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"June 7 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest FF1DD08CA9EB6528E1A6389E7154BD9586F24370</code>).", + "description": "geoip and geoip6 databases updated to \"June 7 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest DA31976A9C7D48C2C16EA70BCE9006772A0F4A34</code>, <code>geoip6-db-digest FF1DD08CA9EB6528E1A6389E7154BD9586F24370</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=c14c662758e95e85aa251c959c…">commit</a>" ] @@ -1778,19 +1689,10 @@ { "start": "2016-07-18", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"July 6 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 19FC902B6A860BA7E4BADCB5404482995F7E0763</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=79939c6f11edbd5bec21594b1f…">commit</a>" - ] - }, - { - "start": "2016-07-18", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"July 6 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 7E717154718F2065240B90F8132F305AF78C9A9D</code>).", + "description": "geoip and geoip6 databases updated to \"July 6 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 19FC902B6A860BA7E4BADCB5404482995F7E0763</code>, <code>geoip6-db-digest 7E717154718F2065240B90F8132F305AF78C9A9D</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=79939c6f11edbd5bec21594b1f…">commit</a>" ] @@ -1798,19 +1700,10 @@ { "start": "2016-08-12", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"August 2 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 9DD185BEC4F482DDD20A0221B3DD3F40175F0123</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1410947351a0e498c2a4c568db…">commit</a>" - ] - }, - { - "start": "2016-08-12", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"August 2 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest B1C1B6BDC9627E3D87530A2C70578AC69C20C5C6</code>).", + "description": "geoip and geoip6 databases updated to \"August 2 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 9DD185BEC4F482DDD20A0221B3DD3F40175F0123</code>, <code>geoip6-db-digest B1C1B6BDC9627E3D87530A2C70578AC69C20C5C6</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1410947351a0e498c2a4c568db…">commit</a>" ] @@ -1883,19 +1776,10 @@ { "start": "2016-09-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"September 6 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 72F8AD2CD7C97D173AD53276366EAD32B13E0A50</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=56f95ba94dfeaacee63047b161…">commit</a>" - ] - }, - { - "start": "2016-09-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"September 6 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest B6427DEAD2291FBF8311A2233AF4960BF4009713</code>).", + "description": "geoip and geoip6 databases updated to \"September 6 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 72F8AD2CD7C97D173AD53276366EAD32B13E0A50</code>, <code>geoip6-db-digest B6427DEAD2291FBF8311A2233AF4960BF4009713</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=56f95ba94dfeaacee63047b161…">commit</a>" ] @@ -1984,19 +1868,10 @@ { "start": "2016-10-05", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"October 4 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest C14DF5AE94101562DEACDD296278B0EFA3EA26E5</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1b4984f196848cd404456fd125…">commit</a>" - ] - }, - { - "start": "2016-10-05", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"October 4 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest A88A828020A558D37F97CF683D4521270F0511A2</code>).", + "description": "geoip and geoip6 databases updated to \"October 4 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest C14DF5AE94101562DEACDD296278B0EFA3EA26E5</code>, <code>geoip6-db-digest A88A828020A558D37F97CF683D4521270F0511A2</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1b4984f196848cd404456fd125…">commit</a>" ] @@ -2040,6 +1915,7 @@ }, { "start": "2016-10-25", + "ongoing": true, "places": [ "eg" ], @@ -2068,10 +1944,11 @@ }, { "start": "2016-11-03", + "ongoing": true, "places": [ "tr" ], - "description": "Turkey blocks Facebook, Twitter, YouTube, WhatsApp", + "description": "Turkey blocks Facebook, Twitter, YouTube, WhatsApp.", "links": [ "<a href=\"https://turkeyblocks.org/2016/11/04/social-media-shutdown-turkey/\">article</a>" ] @@ -2081,7 +1958,7 @@ "places": [ "tr" ], - "description": "Turkey orders a block on VPN services and Tor", + "description": "Turkey orders a block on VPN services and Tor.", "links": [ "<a href=\"http://turk-internet.com/portal/yazigoster.php?yaziid=54465\">Turkish article</a>", "<a href=\"https://motherboard.vice.com/read/turkey-doubles-down-on-censorship-with-bl…">English article</a>", @@ -2091,19 +1968,10 @@ { "start": "2016-11-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"November 3 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 363C038D0BE61D6E0A63C43DE8EA70771ED7BEA5</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=ea597832e25e776a45375d18a9…">commit</a>" - ] - }, - { - "start": "2016-11-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"November 3 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 6110A2B794AFF0180FD096A4759434CABD289C40</code>).", + "description": "geoip and geoip6 databases updated to \"November 3 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 363C038D0BE61D6E0A63C43DE8EA70771ED7BEA5</code>, <code>geoip6-db-digest 6110A2B794AFF0180FD096A4759434CABD289C40</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=ea597832e25e776a45375d18a9…">commit</a>" ] @@ -2179,19 +2047,10 @@ { "start": "2016-12-09", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"December 7 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 1317BB3525E85E01FB34A89E04CE549AC23D07BD</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=9db47e792160766de49b76bff7…">commit</a>" - ] - }, - { - "start": "2016-12-09", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"December 7 2016 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 865048C69BEC02B37268BFBAD66D9729B21CFCF5</code>).", + "description": "geoip and geoip6 databases updated to \"December 7 2016 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 1317BB3525E85E01FB34A89E04CE549AC23D07BD</code>, <code>geoip6-db-digest 865048C69BEC02B37268BFBAD66D9729B21CFCF5</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=9db47e792160766de49b76bff7…">commit</a>" ] @@ -2213,6 +2072,7 @@ }, { "start": "2016-12-15", + "ongoing": true, "places": [ "cd" ], @@ -2226,19 +2086,10 @@ { "start": "2017-01-04", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"January 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 672C29A4FA9BF81DE97CFE128741445E2BDE8097</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=3833f67dd2dc35dbcfe1d5659c…">commit</a>" - ] - }, - { - "start": "2017-01-04", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"January 4 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 81F380639A8E1000539204949A363FD3BFAFBA74</code>).", + "description": "geoip and geoip6 databases updated to \"January 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 672C29A4FA9BF81DE97CFE128741445E2BDE8097</code>, <code>geoip6-db-digest 81F380639A8E1000539204949A363FD3BFAFBA74</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=3833f67dd2dc35dbcfe1d5659c…">commit</a>" ] @@ -2272,6 +2123,7 @@ }, { "start": "2017-02-10", + "ongoing": true, "protocols": [ "<OR>", "exit" @@ -2284,19 +2136,10 @@ { "start": "2017-02-12", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"February 8 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest C0C6099CE335916862978F77756C0B42521A74B2</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=f6016058b42aa1c4528fd8c7c2…">commit</a>" - ] - }, - { - "start": "2017-02-12", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"February 8 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest A54B14B9D47584E010F763D3EAE23C4726F4A8D5</code>).", + "description": "geoip and geoip6 databases updated to \"February 8 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest C0C6099CE335916862978F77756C0B42521A74B2</code>, <code>geoip6-db-digest A54B14B9D47584E010F763D3EAE23C4726F4A8D5</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=f6016058b42aa1c4528fd8c7c2…">commit</a>" ] @@ -2347,19 +2190,10 @@ { "start": "2017-03-08", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"March 7 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 63921843E3AAA632088D189D877F836A373CD40D</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=4488c319dde4c986da01a4635e…">commit</a>" - ] - }, - { - "start": "2017-03-08", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"March 7 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 2B93B9C6679BB09E1746F212A6DCDC6E710F5F52</code>).", + "description": "geoip and geoip6 databases updated to \"March 7 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 63921843E3AAA632088D189D877F836A373CD40D</code>, <code>geoip6-db-digest 2B93B9C6679BB09E1746F212A6DCDC6E710F5F52</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=4488c319dde4c986da01a4635e…">commit</a>" ] @@ -2378,32 +2212,26 @@ { "start": "2017-04-06", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"April 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 0F3D4A456E5078CC9E49398ADCB04C40EA49B793</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=9d7933296c187061ce121012cd…">commit</a>" - ] - }, - { - "start": "2017-04-06", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"April 4 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 04F41F05FA167EF6EEE3FE953404AB0BCCD33008</code>).", + "description": "geoip and geoip6 databases updated to \"April 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 0F3D4A456E5078CC9E49398ADCB04C40EA49B793</code>, <code>geoip6-db-digest 04F41F05FA167EF6EEE3FE953404AB0BCCD33008</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=9d7933296c187061ce121012cd…">commit</a>" ] }, { "start": "2017-04-14", + "end": "2017-08-20", "protocols": [ "<OR>" ], "description": "Directory authority maatuska's bwscanner stops operating, leading to a drop in traffic on some relays.", "links": [ - "<a href=\"https://lists.torproject.org/pipermail/tor-consensus-health/2017-April/0078…">tor-consensus-health post</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-April/012215.html\">tor-dev thread</a>" + "<a href=\"https://lists.torproject.org/pipermail/tor-consensus-health/2017-April/0078…">tor-consensus-health post about start</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-consensus-health/2017-August/008…">tor-consensus-health post about end</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-dev/2017-April/012215.html\">tor-dev thread</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-consensus-health/2017-May/007908…">analysis</a>" ] }, { @@ -2426,19 +2254,10 @@ { "start": "2017-05-08", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"May 2 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest B2E5105287668771E34A66F90B34982D419727EF</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=5207e41ffeb99089adbb56376c…">commit</a>" - ] - }, - { - "start": "2017-05-08", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"May 2 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 8DA8AC3C8158CBFDF7DB53BBF73338246872371A</code>).", + "description": "geoip and geoip6 databases updated to \"May 2 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest B2E5105287668771E34A66F90B34982D419727EF</code>, <code>geoip6-db-digest 8DA8AC3C8158CBFDF7DB53BBF73338246872371A</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=5207e41ffeb99089adbb56376c…">commit</a>" ] @@ -2486,25 +2305,16 @@ "links": [ "<a href=\"https://blog.torproject.org/blog/tor-browser-70-released\">blog post</a>", "<a href=\"https://bugs.torproject.org/22429\">IPv6 ticket</a>", - "<a href=\"https://trac.torproject.org/projects/tor/ticket/22468\">frosty and dragon ticket</a>" - ] - }, - { - "start": "2017-06-09", - "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"June 8 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest AFD609025B66305AD9FA8E0B15AF4F2BC82271F1</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=104e8fa751c1bef051ac47e39d…">commit</a>" + "<a href=\"https://bugs.torproject.org/22468\">frosty and dragon ticket</a>" ] }, { "start": "2017-06-09", "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"June 8 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest A69FD14ACE46EE695F589ACE0EB7B915285B51B4</code>).", + "description": "geoip and geoip6 databases updated to \"June 8 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest AFD609025B66305AD9FA8E0B15AF4F2BC82271F1</code>, <code>geoip6-db-digest A69FD14ACE46EE695F589ACE0EB7B915285B51B4</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=104e8fa751c1bef051ac47e39d…">commit</a>" ] @@ -2608,19 +2418,10 @@ { "start": "2017-07-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"July 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 3D04F191098640F2E03B4D5F7800088D14B7EC30</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=b6acfa491e7fdb6e3d71665a55…">commit</a>" - ] - }, - { - "start": "2017-07-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"July 4 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest A3649B9E909C59942FB3D8F874AB4BEA36E8BEC1</code>).", + "description": "geoip and geoip6 databases updated to \"July 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 3D04F191098640F2E03B4D5F7800088D14B7EC30</code>, <code>geoip6-db-digest A3649B9E909C59942FB3D8F874AB4BEA36E8BEC1</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=b6acfa491e7fdb6e3d71665a55…">commit</a>" ] @@ -2641,21 +2442,25 @@ { "start": "2017-08-03", "protocols": [ - "ipv4" + "ipv4", + "ipv6" ], - "description": "geoip database updated to \"August 3 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 75AABD32582AC554AF252DDC7BBBABE7C6F28B28</code>).", + "description": "geoip and geoip6 databases updated to \"August 3 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 75AABD32582AC554AF252DDC7BBBABE7C6F28B28</code>, <code>geoip6-db-digest A52EFFEF8CF6F3CAA8EBD34961361544E959FAE1</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1280de42a41ccf7ae398cc8652…">commit</a>" ] }, { - "start": "2017-08-03", - "protocols": [ - "ipv6" + "start": "2017-08-07", + "ongoing": true, + "places": [ + "cd" ], - "description": "geoip6 database updated to \"August 3 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest A52EFFEF8CF6F3CAA8EBD34961361544E959FAE1</code>).", + "description": "The Democratic Republic of the Congo orders a block of social media services.", "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=1280de42a41ccf7ae398cc8652…">commit</a>" + "<a href=\"https://www.amnesty.org/en/latest/news/2017/08/drc-block-on-social-media-im…">article</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-bridge-country.html?start=2017-06-…">bridge graph</a>" ] }, { @@ -2718,19 +2523,10 @@ { "start": "2017-09-07", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"September 6 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 0CE9EA8882EDED265451C36B49AE7BBB06A11C16</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=09618ffe38bc6cd91755c6c1ae…">commit</a>" - ] - }, - { - "start": "2017-09-07", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"September 6 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest C4573496EBD1CC335843067107DA49E482568FF6</code>).", + "description": "geoip and geoip6 databases updated to \"September 6 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 0CE9EA8882EDED265451C36B49AE7BBB06A11C16</code>, <code>geoip6-db-digest C4573496EBD1CC335843067107DA49E482568FF6</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=09618ffe38bc6cd91755c6c1ae…">commit</a>" ] @@ -2745,6 +2541,7 @@ }, { "start": "2017-09-15", + "end": "2017-10-12", "description": "Outage of the op-hk OnionPerf instance. Reported timeouts on the tor network increased, download speed improved.", "links": [ "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-October/000476.htm…">mailing list post</a>", @@ -2767,19 +2564,10 @@ { "start": "2017-10-05", "protocols": [ - "ipv4" - ], - "description": "geoip database updated to \"October 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 3A59213E5CFEE380F544B72DC1105366C6BD1CDE</code>).", - "links": [ - "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=b9d9b16b7685c79e6440e5f8a1…">commit</a>" - ] - }, - { - "start": "2017-10-05", - "protocols": [ + "ipv4", "ipv6" ], - "description": "geoip6 database updated to \"October 4 2017 Maxmind GeoLite2 Country\" (<code>geoip6-db-digest 1B8C975E5C62CF0FB5B4E598AE27B7189952BB09</code>).", + "description": "geoip and geoip6 databases updated to \"October 4 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 3A59213E5CFEE380F544B72DC1105366C6BD1CDE</code>, <code>geoip6-db-digest 1B8C975E5C62CF0FB5B4E598AE27B7189952BB09</code>).", "links": [ "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=b9d9b16b7685c79e6440e5f8a1…">commit</a>" ] @@ -2841,6 +2629,25 @@ ] }, { + "start": "2017-11-10", + "protocols": [ + "ipv4", + "ipv6" + ], + "description": "geoip and geoip6 databases updated to \"November 6 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest E3C910F3B2A6C916C7BE33A943091EF57048B72C</code>, <code>geoip6-db-digest E8BD5B2E6554C27F718F1222667C09680D75F799</code>).", + "links": [ + "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=6f8c32b7deb9f0cec6d1553aba…">commit</a>" + ] + }, + { + "start": "2017-11-11", + "end": "2017-11-12", + "description": "Outage of the op-hk OnionPerf instance.", + "links": [ + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-10-01&end=2017-12-01…">op-hk graph</a>" + ] + }, + { "start": "2017-11-15", "end": "2017-11-15", "protocols": [ @@ -2865,6 +2672,17 @@ ] }, { + "start": "2017-12-04", + "ongoing": true, + "description": "DDoS attack uses a bug in the KIST scheduler to crash relays by running them out of memory.", + "links": [ + "<a href=\"https://lists.torproject.org/pipermail/tor-relays/2017-December/013669.html\">tor-relays thread</a>", + "<a href=\"https://metrics.torproject.org/relayflags.html?start=2017-11-01&end=2018-01…">relay graph</a>", + "<a href=\"https://lists.torproject.org/pipermail/tor-project/2017-December/001604.htm…">summary post</a>", + "<a href=\"https://bugs.torproject.org/24665\">ticket</a>" + ] + }, + { "start": "2017-12-05", "end": "2017-12-15", "places": [ @@ -2876,13 +2694,14 @@ ] }, { - "start": "2017-12-04", - "description": "DDoS attack uses a bug in the KIST scheduler to crash relays by running them out of memory.", + "start": "2017-12-20", + "protocols": [ + "ipv4", + "ipv6" + ], + "description": "geoip and geoip6 databases updated to \"December 6 2017 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 1D486694A710145631B295CC39ECC5682F75858C</code>, <code>geoip6-db-digest F33231CAC761A71F7C19273DB1E11CEE01E2D982</code>).", "links": [ - "<a href=\"https://lists.torproject.org/pipermail/tor-relays/2017-December/013669.html\">tor-relays thread</a>", - "<a href=\"https://metrics.torproject.org/relayflags.html?start=2017-11-01&end=2018-01…">relay graph</a>", - "<a href=\"https://lists.torproject.org/pipermail/tor-project/2017-December/001604.htm…">summary post</a>", - "<a href=\"https://bugs.torproject.org/24665\">ticket</a>" + "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=428f8a375b8846edd1a056ce66…">commit</a>" ] }, { @@ -2895,6 +2714,7 @@ }, { "start": "2017-12-28", + "ongoing": true, "places": [ "ir" ], @@ -2907,6 +2727,25 @@ ] }, { + "start": "2018-01-05", + "ongoing": true, + "description": "Outage of the op-hk OnionPerf instance.", + "links": [ + "<a href=\"https://metrics.torproject.org/torperf.html?start=2017-12-01&end=2017-02-01…">op-hk graph</a>" + ] + }, + { + "start": "2018-01-08", + "protocols": [ + "ipv4", + "ipv6" + ], + "description": "geoip and geoip6 databases updated to \"January 5 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest ACE2AF82816B9D3F58FC9C79A41B4506D6DAD713</code>, <code>geoip6-db-digest 387B3F555F1E054F0F9971C726F49848C5B5CF8B</code>).", + "links": [ + "<a href=\"https://gitweb.torproject.org/tor.git/commit/?id=8efbeb09826030302481619dab…">commit</a>" + ] + }, + { "start": "2016-02-24", "places": [ "tm" @@ -3024,6 +2863,7 @@ }, { "start": "2017-01-15", + "end": "2017-03-01", "places": [ "ae" ], @@ -3031,9 +2871,9 @@ "<OR>", "relay" ], - "description": "Huge increase in relay users (200k+).", + "description": "Huge increase in relay users (400k+).", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">graph</a>", "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-January/000284.htm…">metrics-team thread</a>", "<a href=\"https://www.reddit.com/r/TOR/comments/5pbukk/united_arab_emirates_went_from…">reddit thread</a>" ], @@ -3087,6 +2927,22 @@ "unknown": true }, { + "start": "2017-03-01", + "end": "2017-07-01", + "places": [ + "ae" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Another increase in relay users, with a slower rate of growth than the previous one.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">graph</a>" + ], + "unknown": true + }, + { "start": "2017-04-05", "end": "2017-04-13", "places": [ @@ -3127,7 +2983,7 @@ "<OR>", "relay" ], - "description": "Direct users fluctuate widely in Taiwan after a 3× sudden increase.", + "description": "Relay users triple and begin to fluctuate in Taiwan.", "links": [ "<a href=\"https://lists.torproject.org/pipermail/tor-talk/2017-May/043206.html\">tor-talk post</a>", "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-02-2…">graph</a>" @@ -3169,6 +3025,7 @@ }, { "start": "2017-06-07", + "end": "2017-12-14", "places": [ "br" ], @@ -3177,7 +3034,7 @@ ], "description": "Sustained increase of meek users in Brazil, similar to the one that took place between 2016-07-21 and 2017-03-03.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-bridge-combined.html?start=2016-06…">graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-bridge-combined.html?start=2016-06…">graph</a>" ], "unknown": true }, @@ -3210,6 +3067,37 @@ "unknown": true }, { + "start": "2017-07-01", + "places": [ + "ae" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Sudden drop in relay users.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-01-0…">graph</a>" + ], + "unknown": true + }, + { + "start": "2017-07-01", + "end": "2017-08-30", + "places": [ + "ae" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Slow increase in relay users.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">graph</a>" + ], + "unknown": true + }, + { "start": "2017-07-15", "end": "2017-07-22", "places": [ @@ -3387,6 +3275,21 @@ "unknown": true }, { + "start": "2017-09-01", + "places": [ + "ae" + ], + "protocols": [ + "<OR>", + "relay" + ], + "description": "Relay users remain volatile but flatten their rate of growth.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">graph</a>" + ], + "unknown": true + }, + { "start": "2017-09-02", "end": "2017-09-21", "protocols": [ @@ -3450,6 +3353,7 @@ }, { "start": "2017-12-10", + "ongoing": true, "places": [ "de" ],

1 0

[metrics-web/master] Adapt format on News page from related events.
by karsten＠torproject.org 10 Jan '18

10 Jan '18

commit 494a2637df6f70fcc13919f7ac91bbc29f371911 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 21 17:10:44 2017 +0100 Adapt format on News page from related events. --- .../org/torproject/metrics/web/NewsServlet.java | 67 +--------------------- src/main/resources/web/jsps/news.jsp | 17 +++++- 2 files changed, 16 insertions(+), 68 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index 7840a40..15717bd 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -82,77 +82,14 @@ public class NewsServlet extends AnyServlet { .getStart()) > 0); /* Sort news into categories. */ - Map<String[], List<String[]>> newsByCategory = new LinkedHashMap<>(); + Map<String[], List<String>> newsByCategory = new LinkedHashMap<>(); for (String[] category : cutOffDates.values()) { newsByCategory.put(category, new ArrayList<>()); } for (News news : this.sortedNews) { - StringBuilder sb = new StringBuilder(); - sb.append("<h3 class=\"media-heading\">").append(news.getStart()); - if (news.getEnd() != null) { - sb.append(" to ").append(news.getEnd()); - } - if (news.getPlaces() != null) { - boolean appendUnknownCountry = false; - for (String place : news.getPlaces()) { - if (this.countries.containsKey(place)) { - sb.append(" <span class=\"label label-warning\">") - .append(this.countries.get(place)).append("</span>"); - } else { - appendUnknownCountry = true; - } - } - if (appendUnknownCountry) { - sb.append(" <span class=\"label label-warning\">" - + "Unknown country</span>"); - } - } - if (news.getProtocols() != null) { - for (String protocol : news.getProtocols()) { - switch (protocol) { - case "relay": - sb.append(" <span class=\"label label-success\">" - + "Relays</span>"); - break; - case "bridge": - sb.append(" <span class=\"label label-primary\">" - + "Bridges</span>"); - break; - case "<OR>": - sb.append(" <span class=\"label label-info\">" - + "<OR></span>"); - break; - default: - sb.append(" <span class=\"label label-info\">").append(protocol) - .append("</span>"); - break; - } - } - } - if (news.isUnknown()) { - sb.append(" <span class=\"label label-default\">" - + "Unknown</span>"); - } - sb.append("</h3><p>").append(news.getDescription()).append("</p>"); - if (news.getLinks() != null && news.getLinks().length > 0) { - int written = 0; - sb.append("<p class=\"links\">"); - for (String link : news.getLinks()) { - if (written++ > 0) { - sb.append(" "); - } - if (link.startsWith("https://metrics.torproject.org/")) { - sb.append(link); - } else { - sb.append(link.replaceFirst(">", " target=\"_blank\">")); - } - } - sb.append("</p>"); - } - String[] formattedNews = new String[] { sb.toString() }; for (Map.Entry<String, String[]> category : cutOffDates.entrySet()) { if (news.getStart().compareTo(category.getKey()) >= 0) { - newsByCategory.get(category.getValue()).add(formattedNews); + newsByCategory.get(category.getValue()).add(news.formatAsTableRow()); break; } } diff --git a/src/main/resources/web/jsps/news.jsp b/src/main/resources/web/jsps/news.jsp index 68f1689..499eade 100644 --- a/src/main/resources/web/jsps/news.jsp +++ b/src/main/resources/web/jsps/news.jsp @@ -20,9 +20,20 @@ <c:forEach var="category" items="${news}" varStatus="status"> <div class="container"> <h2>${category.key[0]} <a href="#${category.key[1]}" name="${category.key[1]}" class="anchor">#</a></h2> - <c:forEach var="entry" items="${category.value}"> - <p>${entry[0]}<br></p> - </c:forEach> + <table class="table events"> + <thead> + <tr> + <th class="dates">Dates</th> + <th class="tags">Places/Protocols</th> + <th class="description">Description and Links</th> + </tr> + </thead> + <tbody> + <c:forEach var="entry" items="${category.value}"> + ${entry} + </c:forEach> + </tbody> + </table> </div> </c:forEach>

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Jan '18

10 Jan '18

commit c2d9ad599f62078642bd61f80ceb33daa3389735 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 10 15:17:49 2018 +0000 Update translations for torbutton-torbuttondtd --- sq/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index 62ee3df6f..4f043464f 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Safest"> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> +<!ENTITY torbutton.prefs.sec_learn_more_label "Meso me teper"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">

1 0