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

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc doc/HACKING/GettingStartedRust.md index a533ba8a2,920596cad..aa29c097d --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@@ -122,23 -119,13 +122,25 @@@ the module calls. Modules which call f Strive to change the C API as little as possible. - We are currently targeting Rust nightly, *for now*. We expect this to - change moving forward, as we understand more about which nightly - features we need. It is on our TODO list to try to cultivate good + We are currently targetting Rust stable. (See CodingStandardsRust.md for more + details.) + -It is on our TODO list to try to cultivate good standing with various distro -maintainers of `rustc` and `cargo`, in order to ensure that whatever version we -solidify on is readily available. ++It is on our TODO list to try to cultivate good +standing with various distro maintainers of `rustc` and `cargo`, in +order to ensure that whatever version we solidify on is readily +available. + +If parts of your Rust code needs to stay in sync with C code (such as +handling enums across the FFI boundary), annonotate these places in a +comment structured as follows: + + /// C_RUST_COUPLED: <path_to_file> `<name_of_c_object>` + +Where <name_of_c_object> can be an enum, struct, constant, etc. Then, +do the same in the C code, to note that rust will need to be changed +when the C does. + + Adding your Rust module to Tor's build system -----------------------------------------------

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit d78f25c077e937bc4fba862450bd6e337cbe4e76 Merge: 547522f56 2deee972a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit 2deee972a37a8b36040f0f37091906b8dec61b25 Merge: 571cb2f66 4847e2216 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:35:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 doc/HACKING/GettingStartedRust.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] Rust: Say that we support rust stable in GettingStartedRust.md
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit db3414dd518d757e9a1c9be6c7987fee54f51cf7 Author: teor <teor(a)torproject.org> Date: Thu Aug 16 18:58:47 2018 +1000 Rust: Say that we support rust stable in GettingStartedRust.md In 24765, we said that we supported rust stable in CodingStandardsRust.md. But we left GettingStartedRust.md saying that we support rust nightly. Closes 27160. --- doc/HACKING/GettingStartedRust.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md index a5253b46a..920596cad 100644 --- a/doc/HACKING/GettingStartedRust.md +++ b/doc/HACKING/GettingStartedRust.md @@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets. Strive to change the C API as little as possible. -We are currently targetting Rust nightly, *for now*. We expect this to change -moving forward, as we understand more about which nightly features we need. It -is on our TODO list to try to cultivate good standing with various distro +We are currently targetting Rust stable. (See CodingStandardsRust.md for more +details.) + +It is on our TODO list to try to cultivate good standing with various distro maintainers of `rustc` and `cargo`, in order to ensure that whatever version we solidify on is readily available.

1 0

[tor/master] Merge branch 'ticket27096'
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit d029a5162d0f2a3255630500f9c81cc4f7bdc103 Merge: 34083f00a fb137b30f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 16 08:32:06 2018 -0400 Merge branch 'ticket27096' changes/bug27096 | 3 +++ src/test/test_options.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+)

1 0

[tor/master] Fix test to pass without HOME env being set
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit f454c283031e282ade3db78ce9da3726ec4a0234 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 12 15:04:58 2018 +0300 Fix test to pass without HOME env being set --- changes/bug27096 | 3 +++ src/test/test_options.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug27096 b/changes/bug27096 new file mode 100644 index 000000000..d1c139549 --- /dev/null +++ b/changes/bug27096 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix two unit tests to work when HOME environment variable is not + set. Fixes bug 27096; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_options.c b/src/test/test_options.c index 4e890205b..dcb8932be 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -473,6 +473,11 @@ test_options_validate__uname_for_server(void *ignored) { (void)ignored; char *msg; + + int unset_home_env = 0; + if (setenv("HOME", "/home/john", 0) == 0) + unset_home_env = 1; + options_test_data_t *tdata = get_options_test_data( "ORPort 127.0.0.1:5555"); setup_capture_of_logs(LOG_WARN); @@ -512,6 +517,8 @@ test_options_validate__uname_for_server(void *ignored) free_options_test_data(tdata); tor_free(msg); teardown_capture_of_logs(); + if (unset_home_env) + unsetenv("HOME"); } static void @@ -1413,6 +1420,11 @@ test_options_validate__paths_needed(void *ignored) (void)ignored; int ret; char *msg; + + int unset_home_env = 0; + if (setenv("HOME", "/home/john", 0) == 0) + unset_home_env = 1; + setup_capture_of_logs(LOG_WARN); options_test_data_t *tdata = get_options_test_data( "PathsNeededToBuildCircuits 0.1\n" @@ -1455,6 +1467,8 @@ test_options_validate__paths_needed(void *ignored) teardown_capture_of_logs(); free_options_test_data(tdata); tor_free(msg); + if (unset_home_env) + unsetenv("HOME"); } static void

1 0

[tor/master] Exclude setenv/unsetenv code on Windows
by nickm＠torproject.org 16 Aug '18

16 Aug '18

commit fb137b30fc69bb9fa4b417cfe47a8191ecf0a70c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 12 15:28:34 2018 +0300 Exclude setenv/unsetenv code on Windows --- src/test/test_options.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index dcb8932be..801b5895f 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -474,9 +474,11 @@ test_options_validate__uname_for_server(void *ignored) (void)ignored; char *msg; +#ifndef _WIN32 int unset_home_env = 0; if (setenv("HOME", "/home/john", 0) == 0) unset_home_env = 1; +#endif options_test_data_t *tdata = get_options_test_data( "ORPort 127.0.0.1:5555"); @@ -517,8 +519,10 @@ test_options_validate__uname_for_server(void *ignored) free_options_test_data(tdata); tor_free(msg); teardown_capture_of_logs(); +#ifndef _WIN32 if (unset_home_env) unsetenv("HOME"); +#endif } static void @@ -1421,9 +1425,11 @@ test_options_validate__paths_needed(void *ignored) int ret; char *msg; +#ifndef _WIN32 int unset_home_env = 0; if (setenv("HOME", "/home/john", 0) == 0) unset_home_env = 1; +#endif setup_capture_of_logs(LOG_WARN); options_test_data_t *tdata = get_options_test_data( @@ -1467,8 +1473,10 @@ test_options_validate__paths_needed(void *ignored) teardown_capture_of_logs(); free_options_test_data(tdata); tor_free(msg); +#ifndef _WIN32 if (unset_home_env) unsetenv("HOME"); +#endif } static void

1 0

[tor-browser-build/master] Picking up changes for build3
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit 1584f48516deaa01a21c704f625ab7203d5d8ea7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 11:42:45 2018 +0000 Picking up changes for build3 Fixed missing items in Changelog, correct sha256sum for new NoScript --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cda434d..5970d71 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -23,6 +23,7 @@ Tor Browser 8.0a10 -- August 20 2018 * Bug 27082: Enable a limited UITour for user onboarding * Bug 26961: New user onboarding * Bug 14952: Enable HTTP2 and AltSvc + * Bug 25735: Tor Browser stalls while loading Facebook login page * Bug 17252: Enable TLS session identifiers with first-party isolation * Bug 26353: Prevent speculative connects that violate first-party isolation * Bug 24056: Use en-US strings in HTML forms if locale is spoofed to english @@ -137,6 +138,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25894: Get a rust cross-compiler for Windows * Bug 25554: Bump mingw-w64 version for ESR 60 * Bug 23561: Fix nsis builds for Windows 64 + * Bug 13469: Windows installer is missing many languages from NSIS file * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041 diff --git a/rbm.conf b/rbm.conf index 57de6cc..028f576 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a10' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0a9 project_name: tor-browser

1 0

[tor-browser-build/master] Bump the NoScript sha256sum value as well
by gk＠torproject.org 16 Aug '18

16 Aug '18

commit b9f89a7b1224659fda8c2030e261e4e270d7c239 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 16 11:27:47 2018 +0000 Bump the NoScript sha256sum value as well --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 549df34..66dc989 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -69,7 +69,7 @@ input_files: - filename: Bundle-Data - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: d41f5d36337569d1a1633303d7d07505ab905efba0644e73edccf43edc0d39e0 + sha256sum: fdc539412a61e6109b9fd331c90bd73faa787eefe1ee8d06b57dc3d906c541cd - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 16 Aug '18

16 Aug '18

commit 335ab1c35c91587783d2780d20444c2964cb134c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 16 11:15:04 2018 +0000 Update translations for abouttor-homepage --- is/aboutTor.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index 63152e0ad..3bae74a99 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -6,20 +6,20 @@ <!ENTITY aboutTor.title "Um Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready.label "Vafraðu í friði fyrir hnýsni."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!"> <!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Leita með DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spurningar?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Skoðaðu notendahandbók Tor-vafrans »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Notendahandbók Tor-vafrans"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.getInvolved.label "Taktu þátt »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0