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

[tor/maint-0.3.2] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.2] Silence a warning about failed descriptor uploads.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a simple 0.3.2 fix for now, and we plan to fix this properly in 0.3.3. --- changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug23662 b/changes/bug23662 new file mode 100644 index 000000000..1000bde3d --- /dev/null +++ b/changes/bug23662 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services): + - Silence a warning about failed v3 onion descriptor uploads since it can + happen naturally under certain edge-cases. Fixes part of bug 23662; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index b2e0a96a2..836f86298 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3339,10 +3339,11 @@ handle_response_upload_hsdesc(dir_connection_t *conn, /* XXX: Trigger control event. */ break; case 400: - log_warn(LD_REND, "Uploading hidden service descriptor: http " - "status 400 (%s) response from dirserver " - "'%s:%d'. Malformed hidden service descriptor?", - escaped(reason), conn->base_.address, conn->base_.port); + log_fn(LOG_PROTOCOL_WARN, LD_REND, + "Uploading hidden service descriptor: http " + "status 400 (%s) response from dirserver " + "'%s:%d'. Malformed hidden service descriptor?", + escaped(reason), conn->base_.address, conn->base_.port); /* XXX: Trigger control event. */ break; default:

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit ceeacc734da441051e8c3cfbab420b7083af89b7 Merge: bf8a7201c ae8683621 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.2] Silence a warning about failed descriptor uploads.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a simple 0.3.2 fix for now, and we plan to fix this properly in 0.3.3. --- changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug23662 b/changes/bug23662 new file mode 100644 index 000000000..1000bde3d --- /dev/null +++ b/changes/bug23662 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services): + - Silence a warning about failed v3 onion descriptor uploads since it can + happen naturally under certain edge-cases. Fixes part of bug 23662; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index b2e0a96a2..836f86298 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3339,10 +3339,11 @@ handle_response_upload_hsdesc(dir_connection_t *conn, /* XXX: Trigger control event. */ break; case 400: - log_warn(LD_REND, "Uploading hidden service descriptor: http " - "status 400 (%s) response from dirserver " - "'%s:%d'. Malformed hidden service descriptor?", - escaped(reason), conn->base_.address, conn->base_.port); + log_fn(LOG_PROTOCOL_WARN, LD_REND, + "Uploading hidden service descriptor: http " + "status 400 (%s) response from dirserver " + "'%s:%d'. Malformed hidden service descriptor?", + escaped(reason), conn->base_.address, conn->base_.port); /* XXX: Trigger control event. */ break; default:

1 0

[tor/master] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/master] Silence a warning about failed descriptor uploads.
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a simple 0.3.2 fix for now, and we plan to fix this properly in 0.3.3. --- changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug23662 b/changes/bug23662 new file mode 100644 index 000000000..1000bde3d --- /dev/null +++ b/changes/bug23662 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services): + - Silence a warning about failed v3 onion descriptor uploads since it can + happen naturally under certain edge-cases. Fixes part of bug 23662; + bugfix on 0.3.2.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index b2e0a96a2..836f86298 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3339,10 +3339,11 @@ handle_response_upload_hsdesc(dir_connection_t *conn, /* XXX: Trigger control event. */ break; case 400: - log_warn(LD_REND, "Uploading hidden service descriptor: http " - "status 400 (%s) response from dirserver " - "'%s:%d'. Malformed hidden service descriptor?", - escaped(reason), conn->base_.address, conn->base_.port); + log_fn(LOG_PROTOCOL_WARN, LD_REND, + "Uploading hidden service descriptor: http " + "status 400 (%s) response from dirserver " + "'%s:%d'. Malformed hidden service descriptor?", + escaped(reason), conn->base_.address, conn->base_.port); /* XXX: Trigger control event. */ break; default:

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 15 Nov '17

15 Nov '17

commit 01c5d4583f3bc33c2c00b16ea269a2b03f5ac55e Merge: 7d1e47559 ae8683621 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23662 | 4 ++++ src/or/directory.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Nov '17

15 Nov '17

commit 679256146a21a811dcdfb1017b483dc2b03b47d3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 15 17:46:58 2017 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index f9d45749e..645e3445a 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -55,4 +55,4 @@ <!ENTITY torsettings.bridgeHelp2 "由于封锁方式不同，某种网桥在一些国家可用，但其他国家可能不可用。如果无法确定您应该使用哪种网桥，请访问 torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "正在连接 Tor 网络，可能需几分钟，请稍等。">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 15 Nov '17

15 Nov '17

commit 816f5716b43e37f83076b278588c8c5d2aadbff1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 15 17:46:42 2017 +0000 Update translations for tor-launcher-properties_completed --- zh_CN/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zh_CN/torlauncher.properties b/zh_CN/torlauncher.properties index 71a69374a..aaec8e5f3 100644 --- a/zh_CN/torlauncher.properties +++ b/zh_CN/torlauncher.properties @@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=必须指定一个或多个网桥。 torlauncher.error_default_bridges_type_missing=必须指定网桥的传输类型。 torlauncher.error_bridge_bad_default_type=没有传输类型为 %S 的可用网桥。请调整设置。 -torlauncher.recommended_bridge=(推荐) +torlauncher.bridge_suffix.meek-amazon=（中国可用） +torlauncher.bridge_suffix.meek-azure=（中国可用） torlauncher.connect=连接 torlauncher.restart_tor=重新启动 Tor

1 0