May 2019 - tor-commits - lists.torproject.org

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 23 May '19

23 May '19

commit c98b229ddea0ddd731b2f010616c7122ed33ccae Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:45:14 2019 +0000 Update translations for abouttor-homepage_completed --- zh-TW/aboutTor.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zh-TW/aboutTor.dtd b/zh-TW/aboutTor.dtd index 40cd64539..c4f06ea12 100644 --- a/zh-TW/aboutTor.dtd +++ b/zh-TW/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> +<!ENTITY aboutTor.donationBanner.line2e "讓 Tor 強壯。"> +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 23 May '19

23 May '19

commit fc8dc3d22574494503e873b3404328c63c43c69a Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:45:06 2019 +0000 Update translations for abouttor-homepage --- zh-TW/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-TW/aboutTor.dtd b/zh-TW/aboutTor.dtd index 964a87e9b..c4f06ea12 100644 --- a/zh-TW/aboutTor.dtd +++ b/zh-TW/aboutTor.dtd @@ -28,5 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.line2e "讓 Tor 強壯。"> <!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0

[tor/master] Merge branch 'tor-github/pr/988'
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 327bb0e2ca72dd57bd1ceb9c05dd90dfffcc92a5 Merge: ebe39dcb9 821dd5458 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu May 23 09:30:36 2019 -0400 Merge branch 'tor-github/pr/988' changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'bug30316_035' into bug30316_040
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 821dd54586bffd95bdd8c9d333b1f80ef55d3742 Merge: 593d29920 0ab4dc7ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 13:48:25 2019 -0400 Merge branch 'bug30316_035' into bug30316_040 Fixes conflicts and also moves bandwidth-file-digest. changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --cc src/feature/dirauth/dirvote.c index 29f5d0450,af8b3dc20..755b99bae --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@@ -348,6 -322,7 +348,8 @@@ format_networkstatus_vote(crypto_pk_t * "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ ++ "%s" /* bandwidth file digest */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ @@@ -365,6 -338,7 +365,8 @@@ flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", ++ bw_file_digest ? bw_file_digest: "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact,

1 0

[tor/master] Move bandwidth-file-headers line to appear in the correct vote section
by dgoulet＠torproject.org 23 May '19

23 May '19

commit 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 29 13:43:50 2019 -0400 Move bandwidth-file-headers line to appear in the correct vote section Fixes bug 30316; bugfix on 0.3.5.1-alpha. --- changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug30316 b/changes/bug30316 new file mode 100644 index 000000000..3e396318a --- /dev/null +++ b/changes/bug30316 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Move the "bandwidth-file-headers" line in directory authority votes + so that it conforms to dir-spec.txt. Fixes bug 30316; bugfix on + 0.3.5.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 5e426b0f8..af8b3dc20 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -322,10 +322,10 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ - "%s" /* bandwidth file headers */ , v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", methods, @@ -338,13 +338,12 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact, shared_random_vote_str ? - shared_random_vote_str : "", - bw_headers_line ? - bw_headers_line : ""); + shared_random_vote_str : ""); tor_free(params); tor_free(flags);

1 0

[translation/torbutton-securitylevelproperties_completed] Update translations for torbutton-securitylevelproperties_completed
by translation＠torproject.org 23 May '19

23 May '19

commit 09354d1cef86a876ed297af86db1c824c6dc33c7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:20:19 2019 +0000 Update translations for torbutton-securitylevelproperties_completed --- zh-TW/securitylevel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-TW/securitylevel.properties b/zh-TW/securitylevel.properties index aae64e426..2ed172343 100644 --- a/zh-TW/securitylevel.properties +++ b/zh-TW/securitylevel.properties @@ -9,7 +9,7 @@ securityLevel.safer.tooltip = 安全性等級：更安全 securityLevel.safer.summary = 停用某些功能,因為其有危險,會造成部份網站失能 securityLevel.safer.description1 = 所有非HTTPS網站會預設停用JavaScript securityLevel.safer.description2 = 有些字形與數學符號被停用 -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. +securityLevel.safer.description3 = 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放 securityLevel.safest.level = 最安全 securityLevel.safest.tooltip = 安全性等級：最安全 securityLevel.safest.summary = 只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本.

1 0

[translation/torbutton-securitylevelproperties] Update translations for torbutton-securitylevelproperties
by translation＠torproject.org 23 May '19

23 May '19

commit c3c6259005d90bca45f1091d072deb57f1dc1690 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:20:12 2019 +0000 Update translations for torbutton-securitylevelproperties --- zh-TW/securitylevel.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-TW/securitylevel.properties b/zh-TW/securitylevel.properties index aae64e426..2ed172343 100644 --- a/zh-TW/securitylevel.properties +++ b/zh-TW/securitylevel.properties @@ -9,7 +9,7 @@ securityLevel.safer.tooltip = 安全性等級：更安全 securityLevel.safer.summary = 停用某些功能,因為其有危險,會造成部份網站失能 securityLevel.safer.description1 = 所有非HTTPS網站會預設停用JavaScript securityLevel.safer.description2 = 有些字形與數學符號被停用 -securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. +securityLevel.safer.description3 = 聲音和影片（HTML5 媒體），和 WebGL 要點擊播放 securityLevel.safest.level = 最安全 securityLevel.safest.tooltip = 安全性等級：最安全 securityLevel.safest.summary = 只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本.

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 23 May '19

23 May '19

commit a94e6f5197939d714cc431ecae09d3d17bf71257 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:19:32 2019 +0000 Update translations for torbutton-torbuttondtd_completed --- zh-TW/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-TW/torbutton.dtd b/zh-TW/torbutton.dtd index d4c46efe4..7868343e3 100644 --- a/zh-TW/torbutton.dtd +++ b/zh-TW/torbutton.dtd @@ -36,6 +36,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_limit_typography "有些字形與數學符號被停用"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型,圖標,數學符號與圖片被停用"> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。"> <!ENTITY torbutton.circuit_display.title "Tor 迴路"> <!ENTITY torbutton.circuit_display.new_circuit "建立新的迴路來連接上此網站">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 23 May '19

23 May '19

commit 08a4aa2352330a9232fd4f7bf39c511ab4494f3d Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 23 13:19:25 2019 +0000 Update translations for torbutton-torbuttondtd --- zh-TW/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-TW/torbutton.dtd b/zh-TW/torbutton.dtd index d4c46efe4..7868343e3 100644 --- a/zh-TW/torbutton.dtd +++ b/zh-TW/torbutton.dtd @@ -36,6 +36,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "所有網站會預設停用JavaScript "> <!ENTITY torbutton.prefs.sec_limit_typography "有些字形與數學符號被停用"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "有些字型,圖標,數學符號與圖片被停用"> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "聲音和影片（HTML5 媒體），和 WebGL 要點擊播放。"> <!ENTITY torbutton.circuit_display.title "Tor 迴路"> <!ENTITY torbutton.circuit_display.new_circuit "建立新的迴路來連接上此網站">

1 0

[tor/master] Now this repository is full of 0.4.1.1-alpha-dev
by nickm＠torproject.org 23 May '19

23 May '19

commit ebe39dcb9225ffe43c6b6d2fe49d4b99d155ff33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 22 18:07:29 2019 -0400 Now this repository is full of 0.4.1.1-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9460ae637..e7f959f17 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.1-alpha]) +AC_INIT([tor],[0.4.1.1-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-22"], # for 0.4.1.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-22"], # for 0.4.1.1-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7694a4d37..49958a462 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.1.1-alpha" +!define VERSION "0.4.1.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 5cf0b1eb0..442bb8157 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.1.1-alpha" +#define VERSION "0.4.1.1-alpha-dev"

1 0