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

[user-manual/master] New onion menu
by colin＠torproject.org 18 Sep '18

18 Sep '18

commit 0eba144712d7df6490b0cd3b1eebdc5a188e2ba8 Author: gus <gus(a)torproject.org> Date: Tue Sep 18 17:23:55 2018 -0300 New onion menu --- C/media/security-slider/slider.png | Bin 33109 -> 194788 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/security-slider/slider.png b/C/media/security-slider/slider.png index 1fc2a60..384e908 100644 Binary files a/C/media/security-slider/slider.png and b/C/media/security-slider/slider.png differ

1 0

[user-manual/master] New identity menu
by colin＠torproject.org 18 Sep '18

18 Sep '18

commit ab7e4503bbcd562fad45bc47c427ffdf17c52925 Author: gus <gus(a)torproject.org> Date: Tue Sep 18 17:26:30 2018 -0300 New identity menu --- C/media/managing-identities/new_identity.png | Bin 228947 -> 1542492 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/managing-identities/new_identity.png b/C/media/managing-identities/new_identity.png index 38f22c6..d44e6c6 100644 Binary files a/C/media/managing-identities/new_identity.png and b/C/media/managing-identities/new_identity.png differ

1 0

[user-manual/master] New screenshot - Check for Tor Browser Update
by colin＠torproject.org 18 Sep '18

18 Sep '18

commit 656ac25414b603d071eb26b919f8dde5bcc6618d Author: gus <gus(a)torproject.org> Date: Tue Sep 18 17:29:10 2018 -0300 New screenshot - Check for Tor Browser Update --- C/media/updating/update1.png | Bin 62407 -> 12557 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/updating/update1.png b/C/media/updating/update1.png index dc1a569..454d133 100644 Binary files a/C/media/updating/update1.png and b/C/media/updating/update1.png differ

1 0

[user-manual/master] Merge remote-tracking branch 'ggus/tb8-updates'
by colin＠torproject.org 18 Sep '18

18 Sep '18

commit 433ad9c2a642b02701508e3b5078c2b7d5e5227b Merge: 8dd53ac 656ac25 Author: Colin Childs <colin(a)torproject.org> Date: Tue Sep 18 15:53:46 2018 -0500 Merge remote-tracking branch 'ggus/tb8-updates' C/managing-identities.page | 17 +++++++++++++---- C/media/managing-identities/new_identity.png | Bin 228947 -> 1542492 bytes C/media/plugins/noscript_menu.png | Bin 75878 -> 624085 bytes C/media/security-slider/slider.png | Bin 33109 -> 194788 bytes C/media/updating/update1.png | Bin 62407 -> 12557 bytes C/onionsites.page | 8 ++++++++ C/plugins.page | 4 ++-- 7 files changed, 23 insertions(+), 6 deletions(-)

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 4c78e5c750a271122e81d77166c7f9ffda3d5c74 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 20:47:27 2018 +0000 Update translations for tor-browser-manual_completed --- es_AR/es_AR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 6731aec93..6a264f1f7 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -2,17 +2,17 @@ # Nico Edu <neteleport(a)gmail.com>, 2016 # ezemelano <melanoeze(a)gmail.com>, 2016 # psss <facevedo(a)openmailbox.org>, 2016 +# Zuhualime Akoochimoya, 2017 # Joaquín Serna, 2017 # Rodolfo Fernando Juarez <rfjuarez(a)gmail.com>, 2017 # orienta cionscj <orientacionscj-survey(a)yahoo.com.ar>, 2017 # dario tomatis <dftomatis(a)gmail.com>, 2017 -# Zuhualime Akoochimoya, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2018-09-07 16:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Zuhualime Akoochimoya, 2018\n" +"Last-Translator: dario tomatis <dftomatis(a)gmail.com>, 2017\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +28,7 @@ msgstr "créditos-del-traductor" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" -"Aprende que puede hacer el navegador Tor para proreger tu privacidad y " +"Conocé lo que puede hacer el navegador Tor para proreger tu privacidad y " "anonimato" #: about-tor-browser.page:10

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 2d8c12dfdf9b6aef731f21620f2a61be2c34f2c0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 20:47:22 2018 +0000 Update translations for tor-browser-manual --- es_AR/es_AR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 6731aec93..6a264f1f7 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -2,17 +2,17 @@ # Nico Edu <neteleport(a)gmail.com>, 2016 # ezemelano <melanoeze(a)gmail.com>, 2016 # psss <facevedo(a)openmailbox.org>, 2016 +# Zuhualime Akoochimoya, 2017 # Joaquín Serna, 2017 # Rodolfo Fernando Juarez <rfjuarez(a)gmail.com>, 2017 # orienta cionscj <orientacionscj-survey(a)yahoo.com.ar>, 2017 # dario tomatis <dftomatis(a)gmail.com>, 2017 -# Zuhualime Akoochimoya, 2018 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2018-09-07 16:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Zuhualime Akoochimoya, 2018\n" +"Last-Translator: dario tomatis <dftomatis(a)gmail.com>, 2017\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +28,7 @@ msgstr "créditos-del-traductor" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" msgstr "" -"Aprende que puede hacer el navegador Tor para proreger tu privacidad y " +"Conocé lo que puede hacer el navegador Tor para proreger tu privacidad y " "anonimato" #: about-tor-browser.page:10

1 0

[tor/master] Comment fix.
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 119159677be14351ebcae647d3988f4f2fd9eb72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:44:24 2018 -0400 Comment fix. --- src/core/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 088540dea..637feec8d 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -2421,7 +2421,7 @@ n_cells_in_circ_queues(const circuit_t *c) return n; } -/** Return the number of bytes allocated for c</c>'s half-open streams. */ +/** Return the number of bytes allocated for c's half-open streams. */ static size_t circuit_alloc_in_half_streams(const circuit_t *c) {

1 0

[tor/master] Teach the OOM module to handle half-open stream info. #27686
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit ab92f934212f0f91f74cd171211117d20a28cc1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:16:27 2018 -0400 Teach the OOM module to handle half-open stream info. #27686 --- src/or/circuitlist.c | 21 ++++++++++++++++++--- src/or/connection_edge.c | 24 ++++++++++++++++++++++-- src/or/connection_edge.h | 6 +++++- src/or/relay.c | 2 +- 4 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index a1efe9b74..ad9b902ac 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1042,9 +1042,9 @@ circuit_free_(circuit_t *circ) circuit_remove_from_origin_circuit_list(ocirc); if (ocirc->half_streams) { - SMARTLIST_FOREACH_BEGIN(ocirc->half_streams, half_edge_t*, + SMARTLIST_FOREACH_BEGIN(ocirc->half_streams, half_edge_t *, half_conn) { - tor_free(half_conn); + half_edge_free(half_conn); } SMARTLIST_FOREACH_END(half_conn); smartlist_free(ocirc->half_streams); } @@ -2324,6 +2324,20 @@ n_cells_in_circ_queues(const circuit_t *c) return n; } +/** Return the number of bytes allocated for c</c>'s half-open streams. */ +static size_t +circuit_alloc_in_half_streams(const circuit_t *c) +{ + if (! CIRCUIT_IS_ORIGIN(c)) { + return 0; + } + const origin_circuit_t *ocirc = CONST_TO_ORIGIN_CIRCUIT(c); + if (ocirc->half_streams) + return smartlist_len(ocirc->half_streams) * sizeof(half_edge_t); + else + return 0; +} + /** * Return the age of the oldest cell queued on c, in timestamp units. * Return 0 if there are no cells queued on c. Requires that now be @@ -2558,6 +2572,7 @@ circuits_handle_oom(size_t current_allocation) /* Now, kill the circuit. */ n = n_cells_in_circ_queues(circ); + const size_t half_stream_alloc = circuit_alloc_in_half_streams(circ); if (! circ->marked_for_close) { circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT); } @@ -2567,6 +2582,7 @@ circuits_handle_oom(size_t current_allocation) ++n_circuits_killed; mem_recovered += n * packed_cell_mem_cost(); + mem_recovered += half_stream_alloc; mem_recovered += freed; if (mem_recovered >= mem_to_recover) @@ -2711,4 +2727,3 @@ assert_circuit_ok,(const circuit_t *c)) tor_assert(!or_circ || !or_circ->rend_splice); } } - diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 1060e7461..eea364ffd 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -477,6 +477,9 @@ connection_half_edge_compare_bsearch(const void *key, const void **member) return *(const streamid_t*)key - e2->stream_id; } +/** Total number of half_edge_t objects allocated */ +static size_t n_half_conns_allocated = 0; + /** * Add a half-closed connection to the list, to watch for activity. * @@ -501,6 +504,7 @@ connection_half_edge_add(const edge_connection_t *conn, } half_conn = tor_malloc_zero(sizeof(half_edge_t)); + ++n_half_conns_allocated; if (!circ->half_streams) { circ->half_streams = smartlist_new(); @@ -530,6 +534,23 @@ connection_half_edge_add(const edge_connection_t *conn, smartlist_insert(circ->half_streams, insert_at, half_conn); } +/** Release space held by he */ +void +half_edge_free_(half_edge_t *he) +{ + if (!he) + return; + --n_half_conns_allocated; + tor_free(he); +} + +/** Return the number of bytes devoted to storing info on half-open streams. */ +size_t +half_streams_get_total_allocation(void) +{ + return n_half_conns_allocated * sizeof(half_edge_t); +} + /** * Find a stream_id_t in the list in O(lg(n)). * @@ -650,7 +671,7 @@ connection_half_edge_is_valid_end(smartlist_t *half_conns, half = smartlist_get(half_conns, remove_idx); smartlist_del_keeporder(half_conns, remove_idx); - tor_free(half); + half_edge_free(half); return 1; } @@ -4412,4 +4433,3 @@ connection_edge_free_all(void) pending_entry_connections = NULL; mainloop_event_free(attach_pending_entry_connections_ev); } - diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 6dbba014c..7bef01e40 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -133,6 +133,11 @@ int connection_half_edge_is_valid_end(smartlist_t *half_conns, int connection_half_edge_is_valid_resolved(smartlist_t *half_conns, streamid_t stream_id); +size_t half_streams_get_total_allocation(void); +void half_edge_free_(half_edge_t *he); +#define half_edge_free(he) \ + FREE_AND_NULL(half_edge_t, half_edge_free_, (he)) + /** @name Begin-cell flags * * These flags are used in RELAY_BEGIN cells to change the default behavior @@ -205,4 +210,3 @@ STATIC int connection_ap_process_http_connect(entry_connection_t *conn); #endif /* defined(CONNECTION_EDGE_PRIVATE) */ #endif /* !defined(TOR_CONNECTION_EDGE_H) */ - diff --git a/src/or/relay.c b/src/or/relay.c index 81bb94d5a..497afe756 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2586,6 +2586,7 @@ cell_queues_check_size(void) { time_t now = time(NULL); size_t alloc = cell_queues_get_total_allocation(); + alloc += half_streams_get_total_allocation(); alloc += buf_get_total_allocation(); alloc += tor_compress_get_total_allocation(); const size_t rend_cache_total = rend_cache_get_total_allocation(); @@ -3142,4 +3143,3 @@ circuit_queue_streams_are_blocked(circuit_t *circ) return circ->streams_blocked_on_p_chan; } } -

1 0

[tor/master] Fix compilation of 27686 on master.
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit eaeb4c1082b7133ec96c4f570818b2a8f4880141 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:22:11 2018 -0400 Fix compilation of 27686 on master. --- src/core/or/connection_edge.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index a1da8a34c..71ea95d6e 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -186,7 +186,8 @@ int connection_half_edge_is_valid_resolved(smartlist_t *half_conns, streamid_t stream_id); size_t half_streams_get_total_allocation(void); -void half_edge_free_(half_edge_t *he); +struct half_edge_t; +void half_edge_free_(struct half_edge_t *he); #define half_edge_free(he) \ FREE_AND_NULL(half_edge_t, half_edge_free_, (he))

1 0

[tor/master] Merge branch 'ticket27686_035'
by nickm＠torproject.org 18 Sep '18

18 Sep '18

commit 88a93ccc7bdae432e07eac1e9b6ad4224f370b91 Merge: 50367d06f eaeb4c108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 16:40:30 2018 -0400 Merge branch 'ticket27686_035' src/core/or/circuitlist.c | 20 ++++++++++++++++++-- src/core/or/connection_edge.c | 23 ++++++++++++++++++++++- src/core/or/connection_edge.h | 6 ++++++ src/core/or/relay.c | 1 + 4 files changed, 47 insertions(+), 3 deletions(-)

1 0