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

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit ad19f1507ac3bfd4b26ae478e61c8ef8c4057f22 Merge: 88b91d7 552bc39 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 7 08:08:28 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --cc src/or/rendservice.c index 82feeeb,79fec9f..eeccd43 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@@ -4091,9 -4077,10 +4100,10 @@@ … [View More]

1 0

[tor/master] Remove delay in hidden service introduction point checks
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 93ede051c2e11326203879f9ce42a50357e0b348 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:14:45 2017 +1100 Remove delay in hidden service introduction point checks Make hidden services with 8 to 10 introduction points check for failed circuits immediately after startup. Previously, they would wait for 5 minutes before performing their first checks. Fixes bug 21594; bugfix on commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. … [View More]--- changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/changes/bug21594 b/changes/bug21594 new file mode 100644 index 0000000..e624d12 --- /dev/null +++ b/changes/bug21594 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Make hidden services with 8 to 10 introduction points check for failed + circuits immediately after startup. Previously, they would wait for 5 + minutes before performing their first checks. Fixes bug 21594; bugfix on + commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4d04da0..f0de386 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -105,9 +105,6 @@ struct rend_service_port_config_s { /** If we can't build our intro circuits, don't retry for this long. */ #define INTRO_CIRC_RETRY_PERIOD (60*5) -/** Don't try to build more than this many circuits before giving up - * for a while.*/ -#define MAX_INTRO_CIRCS_PER_PERIOD 10 /** How many times will a hidden service operator attempt to connect to * a requested rendezvous point before giving up? */ #define MAX_REND_FAILURES 1 @@ -3886,6 +3883,18 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data) } SMARTLIST_FOREACH_END(intro); } +/** Don't try to build more than this many circuits before giving up + * for a while. Dynamically calculated based on the configured number of + * introduction points for the service, n_intro_points_wanted. */ +static int +rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted) +{ + /* Allow all but one of the initial connections to fail and be + * retried. (If all fail, we *want* to wait, because something is broken.) */ + tor_assert(n_intro_points_wanted <= NUM_INTRO_POINTS_MAX); + return (int)(2*n_intro_points_wanted + NUM_INTRO_POINTS_EXTRA); +} + /** For every service, check how many intro points it currently has, and: * - Invalidate introdution points based on specific criteria, see * remove_invalid_intro_points comments. @@ -3937,7 +3946,8 @@ rend_consider_services_intro_points(void) service->intro_period_started = now; service->n_intro_circuits_launched = 0; } else if (service->n_intro_circuits_launched >= - MAX_INTRO_CIRCS_PER_PERIOD) { + rend_max_intro_circs_per_period( + service->n_intro_points_wanted)) { /* We have failed too many times in this period; wait for the next * one before we try again. */ continue; [View Less]

1 0

[tor/maint-0.3.0] Merge branch 'bug21594_030_squashed' into maint-0.3.0
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 552bc39c327624555034df40c3646fb88a6dc85b Merge: 333d5d0 93ede05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 7 08:05:16 2017 -0500 Merge branch 'bug21594_030_squashed' into maint-0.3.0 changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.0] Remove delay in hidden service introduction point checks
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 93ede051c2e11326203879f9ce42a50357e0b348 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:14:45 2017 +1100 Remove delay in hidden service introduction point checks Make hidden services with 8 to 10 introduction points check for failed circuits immediately after startup. Previously, they would wait for 5 minutes before performing their first checks. Fixes bug 21594; bugfix on commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. … [View More]--- changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/changes/bug21594 b/changes/bug21594 new file mode 100644 index 0000000..e624d12 --- /dev/null +++ b/changes/bug21594 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Make hidden services with 8 to 10 introduction points check for failed + circuits immediately after startup. Previously, they would wait for 5 + minutes before performing their first checks. Fixes bug 21594; bugfix on + commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4d04da0..f0de386 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -105,9 +105,6 @@ struct rend_service_port_config_s { /** If we can't build our intro circuits, don't retry for this long. */ #define INTRO_CIRC_RETRY_PERIOD (60*5) -/** Don't try to build more than this many circuits before giving up - * for a while.*/ -#define MAX_INTRO_CIRCS_PER_PERIOD 10 /** How many times will a hidden service operator attempt to connect to * a requested rendezvous point before giving up? */ #define MAX_REND_FAILURES 1 @@ -3886,6 +3883,18 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data) } SMARTLIST_FOREACH_END(intro); } +/** Don't try to build more than this many circuits before giving up + * for a while. Dynamically calculated based on the configured number of + * introduction points for the service, n_intro_points_wanted. */ +static int +rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted) +{ + /* Allow all but one of the initial connections to fail and be + * retried. (If all fail, we *want* to wait, because something is broken.) */ + tor_assert(n_intro_points_wanted <= NUM_INTRO_POINTS_MAX); + return (int)(2*n_intro_points_wanted + NUM_INTRO_POINTS_EXTRA); +} + /** For every service, check how many intro points it currently has, and: * - Invalidate introdution points based on specific criteria, see * remove_invalid_intro_points comments. @@ -3937,7 +3946,8 @@ rend_consider_services_intro_points(void) service->intro_period_started = now; service->n_intro_circuits_launched = 0; } else if (service->n_intro_circuits_launched >= - MAX_INTRO_CIRCS_PER_PERIOD) { + rend_max_intro_circs_per_period( + service->n_intro_points_wanted)) { /* We have failed too many times in this period; wait for the next * one before we try again. */ continue; [View Less]

1 0

[tor/release-0.3.0] Merge branch 'bug21594_030_squashed' into maint-0.3.0
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 552bc39c327624555034df40c3646fb88a6dc85b Merge: 333d5d0 93ede05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 7 08:05:16 2017 -0500 Merge branch 'bug21594_030_squashed' into maint-0.3.0 changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.0] Remove delay in hidden service introduction point checks
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 93ede051c2e11326203879f9ce42a50357e0b348 Author: teor <teor2345(a)gmail.com> Date: Thu Mar 2 15:14:45 2017 +1100 Remove delay in hidden service introduction point checks Make hidden services with 8 to 10 introduction points check for failed circuits immediately after startup. Previously, they would wait for 5 minutes before performing their first checks. Fixes bug 21594; bugfix on commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. … [View More]--- changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/changes/bug21594 b/changes/bug21594 new file mode 100644 index 0000000..e624d12 --- /dev/null +++ b/changes/bug21594 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden services): + - Make hidden services with 8 to 10 introduction points check for failed + circuits immediately after startup. Previously, they would wait for 5 + minutes before performing their first checks. Fixes bug 21594; bugfix on + commit 190aac0eab9 in Tor 0.2.3.9-alpha. Reported by alecmuffett. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4d04da0..f0de386 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -105,9 +105,6 @@ struct rend_service_port_config_s { /** If we can't build our intro circuits, don't retry for this long. */ #define INTRO_CIRC_RETRY_PERIOD (60*5) -/** Don't try to build more than this many circuits before giving up - * for a while.*/ -#define MAX_INTRO_CIRCS_PER_PERIOD 10 /** How many times will a hidden service operator attempt to connect to * a requested rendezvous point before giving up? */ #define MAX_REND_FAILURES 1 @@ -3886,6 +3883,18 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data) } SMARTLIST_FOREACH_END(intro); } +/** Don't try to build more than this many circuits before giving up + * for a while. Dynamically calculated based on the configured number of + * introduction points for the service, n_intro_points_wanted. */ +static int +rend_max_intro_circs_per_period(unsigned int n_intro_points_wanted) +{ + /* Allow all but one of the initial connections to fail and be + * retried. (If all fail, we *want* to wait, because something is broken.) */ + tor_assert(n_intro_points_wanted <= NUM_INTRO_POINTS_MAX); + return (int)(2*n_intro_points_wanted + NUM_INTRO_POINTS_EXTRA); +} + /** For every service, check how many intro points it currently has, and: * - Invalidate introdution points based on specific criteria, see * remove_invalid_intro_points comments. @@ -3937,7 +3946,8 @@ rend_consider_services_intro_points(void) service->intro_period_started = now; service->n_intro_circuits_launched = 0; } else if (service->n_intro_circuits_launched >= - MAX_INTRO_CIRCS_PER_PERIOD) { + rend_max_intro_circs_per_period( + service->n_intro_points_wanted)) { /* We have failed too many times in this period; wait for the next * one before we try again. */ continue; [View Less]

1 0

[tor/master] Merge branch 'bug21594_030_squashed' into maint-0.3.0
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 552bc39c327624555034df40c3646fb88a6dc85b Merge: 333d5d0 93ede05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 7 08:05:16 2017 -0500 Merge branch 'bug21594_030_squashed' into maint-0.3.0 changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 07 Mar '17

07 Mar '17

commit 7ec17188fe51298912db50e2f7c14886b1b7f3d6 Merge: 7ffef14 552bc39 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 7 08:08:17 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21594 | 5 +++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 07 Mar '17

07 Mar '17

commit b1cfc66af529ae87fca88b5ab8e94c441f37c2e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 7 11:48:20 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/vi/vi.po b/vi/vi.po index 55360d3..b413247 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -398,11 +398,12 @@ msgstr "" #: downloading.page:95 msgid "Install Satori from the Chrome App Store." -msgstr … [View More]"" +msgstr "Cài đặt Satori từ kho ứng dụng — Chrome App Store." #: downloading.page:100 msgid "Select Satori from your browser’s Apps menu." msgstr "" +"Chọn Satori từ danh mục các ứng dụng — Apps — của trình duyệt của bạn." #: downloading.page:105 msgid "" @@ -412,12 +413,19 @@ msgid "" "after the name of the program — each one represents a different source from " "which to get the software. Your download will then begin." msgstr "" +"Khi Satori mở, kích vào ngôn ngữ ưa thích. Một danh mục sẽ mở liệt kê các " +"bản tải về hiện có cho ngôn ngữ đó. Tìm mục cho Trình duyệt Tor phía dưới " +"tên hệ điều hành của bạn. Chọn “A” hoặc “B” phía sau tên của chương trình — " +"mỗi cái biểu diễn một nguồn khác nhau để tải phần mềm. Việc tải về của bạn " +"sau đó sẽ bắt đầu." #: downloading.page:115 msgid "" "Wait for your download to finish, then find the “Generate Hash” section in " "Satori’s menu and click “Select Files”." msgstr "" +"Chờ cho việc tải về kết thúc, rồi tìm mục “Generate Hash” trong danh mục của" +" Satori và kích chuột vào “Select Files”." #: downloading.page:121 msgid "" @@ -429,6 +437,14 @@ msgid "" "Browser</link>. If they do not match, you may need to try downloading again," " or from a different source." msgstr "" +"Chọn tệp tin Trình duyệt Tor được tải về. Satori sẽ hiển thị giữ liệc xác " +"minh checksum của tệp tin đó, và bạn nên so sánh với giữ liệu xác minh ban " +"đầu của phần mềm: bạn có thể tìm thấy nó bằng việc kích chuột vào từ " +"“checksum” phía sau đường kết nối bạn đã kích chuột vào để bắt đầu việc tải " +"về. Nếu những giữ liệu xác minh đó là phù hợp, việc tải về đã thành công, và" +" bạn có thể <link xref=\"first-time\">bắt đầu sử dụng Trình duyệt " +"Tor</link>. Nếu chúng không đồng nhất, bạn có lẽ nên thử tải lại, hay tải về" +" từ một nguồn khác." #: first-time.page:7 msgid "Learn how to use Tor Browser for the first time" [View Less]

1 0

[tor-messenger-build/master] Update signmars.py to reflect signing certificate
by sukhbir＠torproject.org 07 Mar '17

07 Mar '17

commit 616b31762b2b0537bb1478e40569de1e70831517 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Mar 7 06:25:10 2017 -0500 Update signmars.py to reflect signing certificate --- tools/update-responses/signmars.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/update-responses/signmars.py b/tools/update-responses/signmars.py index a79dfae..67e2e9b 100644 --- a/tools/update-responses/signmars.py +++ b/tools/update-responses/signmars.py @@ -129,6 +129,7 @@ def … [View More]

1 0