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

[tor/master] Terminate rep_hist_get_overload_stats_lines() with an NL.
by nickm＠torproject.org 18 Mar '21

18 Mar '21

commit cd0e5a942eee0f08f4311899c09c6783b2c8e22c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 18 13:30:49 2021 -0400 Terminate rep_hist_get_overload_stats_lines() with an NL. We use it in router.c, where chunks are joined with "", not with NL... so leaving off the terminating NL will lead to an unparseable extrainfo. Found by toralf. Bug not in any released Tor. --- src/feature/stats/rephist.c | 8 ++++---- src/test/test_stats.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 7c0c28804c..4ad5d46b0c 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -233,7 +233,7 @@ rep_hist_get_overload_stats_lines(void) /* First encode the general overload */ if (overload_happened_recently(overload_stats.overload_general_time, 72)) { format_iso_time(tbuf, overload_stats.overload_general_time); - smartlist_add_asprintf(chunks, "overload-general %d %s", + smartlist_add_asprintf(chunks, "overload-general %d %s\n", OVERLOAD_STATS_VERSION, tbuf); } @@ -243,7 +243,7 @@ rep_hist_get_overload_stats_lines(void) format_iso_time(tbuf, overload_stats.overload_ratelimits_time); smartlist_add_asprintf(chunks, "overload-ratelimits %d %s %" PRIu64 " %" PRIu64 - " %" PRIu64 " %" PRIu64, + " %" PRIu64 " %" PRIu64 "\n", OVERLOAD_STATS_VERSION, tbuf, options->BandwidthRate, options->BandwidthBurst, overload_stats.overload_read_count, @@ -254,7 +254,7 @@ rep_hist_get_overload_stats_lines(void) if (overload_happened_recently( overload_stats.overload_fd_exhausted_time, 72)) { format_iso_time(tbuf, overload_stats.overload_fd_exhausted_time); - smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s", + smartlist_add_asprintf(chunks, "overload-fd-exhausted %d %s\n", OVERLOAD_STATS_VERSION, tbuf); } @@ -263,7 +263,7 @@ rep_hist_get_overload_stats_lines(void) goto done; } - result = smartlist_join_strings(chunks, "\n", 0, NULL); + result = smartlist_join_strings(chunks, "", 0, NULL); done: SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); diff --git a/src/test/test_stats.c b/src/test/test_stats.c index a34713b650..465256a1e1 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -728,7 +728,7 @@ test_overload_stats(void *arg) /* Now check the string */ stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-general 1 2002-01-03 23:00:00", OP_EQ, stats_str); + tt_str_op("overload-general 1 2002-01-03 23:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward 72 hours: see that the line has disappeared. */ @@ -744,7 +744,7 @@ test_overload_stats(void *arg) rep_hist_note_overload(OVERLOAD_GENERAL); stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-general 1 2002-01-07 00:00:00", OP_EQ, stats_str); + tt_str_op("overload-general 1 2002-01-07 00:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Also note an fd exhaustion event */ @@ -752,7 +752,7 @@ test_overload_stats(void *arg) stats_str = rep_hist_get_overload_stats_lines(); tt_str_op("overload-general 1 2002-01-07 00:00:00\n" - "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str); + "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward. Register DNS overload. See that the time changed */ @@ -763,7 +763,7 @@ test_overload_stats(void *arg) stats_str = rep_hist_get_overload_stats_lines(); tt_str_op("overload-general 1 2002-01-07 02:00:00\n" - "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str); + "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward. Register a bandwidth ratelimit event. See that the @@ -780,7 +780,7 @@ test_overload_stats(void *arg) stats_str = rep_hist_get_overload_stats_lines(); tt_str_op("overload-general 1 2002-01-07 02:00:00\n" "overload-ratelimits 1 2002-01-07 04:00:00 1000 2000 1 0\n" - "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str); + "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward 24 hours: no rate limit line anymore. */ @@ -789,7 +789,7 @@ test_overload_stats(void *arg) stats_str = rep_hist_get_overload_stats_lines(); tt_str_op("overload-general 1 2002-01-07 02:00:00\n" - "overload-fd-exhausted 1 2002-01-07 00:00:00", OP_EQ, stats_str); + "overload-fd-exhausted 1 2002-01-07 00:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward 44 hours: no fd exhausted line anymore. */ @@ -797,7 +797,7 @@ test_overload_stats(void *arg) update_approx_time(current_time); stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-general 1 2002-01-07 02:00:00", OP_EQ, stats_str); + tt_str_op("overload-general 1 2002-01-07 02:00:00\n", OP_EQ, stats_str); tor_free(stats_str); /* Move the time forward 2 hours: there is nothing left. */ @@ -815,7 +815,7 @@ test_overload_stats(void *arg) * registered ten more overload events, but only one should have been counted * because of the rate limiter */ stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0", + tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0\n", OP_EQ, stats_str); tor_free(stats_str); @@ -828,7 +828,7 @@ test_overload_stats(void *arg) rep_hist_note_overload(OVERLOAD_READ); } stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0", + tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 2 0\n", OP_EQ, stats_str); tor_free(stats_str); @@ -842,7 +842,7 @@ test_overload_stats(void *arg) rep_hist_note_overload(OVERLOAD_WRITE); } stats_str = rep_hist_get_overload_stats_lines(); - tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 3 1", + tt_str_op("overload-ratelimits 1 2002-01-10 02:00:00 1000 2000 3 1\n", OP_EQ, stats_str); tor_free(stats_str);

1 0

[tor/master] Minor edits to changelog
by nickm＠torproject.org 18 Mar '21

18 Mar '21

commit 411db63fc36878af2627e43d3e64f607a1979a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 18 10:16:37 2021 -0400 Minor edits to changelog --- ChangeLog | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4c0dc431e..646e0c8629 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,13 +14,13 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 Neel Chauhan. o Major features (directory authorityl): - - When voting for a relay with a Sybil-like appearance, add the - Sybil flag when clearing out the other flags. This lets a relay - operator know why their relay hasn't been voted on. Closes ticket - 40255. Patch by Neel Chauhan. + - When voting on a relay with a Sybil-like appearance, add the Sybil + flag when clearing out the other flags. This lets a relay operator + know why their relay hasn't been included in the consensus. Closes + ticket 40255. Patch by Neel Chauhan. o Major features (metrics): - - Relays now report how overloaded they are in their extra-info + - Relays now report how overloaded they are in their extrainfo documents. This information is controlled with the OverloadStatistics torrc option, and it will be used to improve decisions about the network's load balancing. Implements proposal @@ -31,7 +31,7 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 connections for relays. Closes ticket 40253. o Major features (statistics): - - Relays now also publish statistics about the number of v3 onion + - Relays now publish statistics about the number of v3 onion services and volume of v3 onion service traffic, in the same manner they already do for v2 onions. Closes ticket 23126. @@ -52,9 +52,9 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 we alter our estimate Xm by taking the maximum of the top 10 most common build time values of the 10ms histogram, and compute Xm as the average of these. Fixes bug 40168; bugfix on 0.2.2.14-alpha. - - Remove max_time calculation and associated warn from circuit build - timeout 'alpha' parameter estimation, as this is no longer needed - by our new estimator from 40168. Fixes bug 34088; bugfix + - Remove max_time calculation and associated warning from circuit + build timeout 'alpha' parameter estimation, as this is no longer + needed by our new estimator from 40168. Fixes bug 34088; bugfix on 0.2.2.9-alpha. o Major bugfixes (signing key): @@ -85,27 +85,27 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 relay fingerprint. Closes ticket 33632. Patch by Neel Chauhan. o Minor features (control port, stream handling): - - Add the stream ID argument to the event line in the ADDRMAP - control event. Closes ticket 40249. Patch by Neel Chauhan. + - Add the stream ID to the event line in the ADDRMAP control event. + Closes ticket 40249. Patch by Neel Chauhan. o Minor features (dormant mode): - - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained - control over whether the client ever becomes dormant from + - Add a new 'DormantTimeoutEnabled' option for coarse-grained + control over whether the client can become dormant from inactivity. Most people won't need this. Closes ticket 40228. o Minor features (logging): - - Change the DoS subsystem heartbeat line format so be more clear on - what has been detected/rejected and which option is disabled if - any. Closes ticket 40308. + - Change the DoS subsystem heartbeat line format to be more clear on + what has been detected/rejected, and which option is disabled (if + any). Closes ticket 40308. - In src/core/mainloop/mainloop.c and src/core/mainloop/connection.c, put brackets around IPv6 addresses in log messages. Closes ticket 40232. Patch by Neel Chauhan. o Minor features (performance, windows): - Use SRWLocks to implement locking on Windows. Replaces the - critical section locking implementation with the faster SRWLocks - available since Windows Vista. Closes ticket 17927. Patch by - Daniel Pinto. + "critical section" locking implementation with the faster + SRWLocks, available since Windows Vista. Closes ticket 17927. + Patch by Daniel Pinto. o Minor features (protocol, proxy support, defense in depth): - Close HAProxy connections if they somehow manage to send us data @@ -118,16 +118,16 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 o Minor features (vote document): - Add a "stats" line to directory authority votes, to report various - statistics that authorities computed about the relays. This will + statistics that authorities compute about the relays. This will help us diagnose the network better. Closes ticket 40314. o Minor bugfixes (build): - - Mini-report in the configure script now shows whether or not lzma - and zstd have been used, not just if enable flag passed in. Fixes - bug 40236; bugfix on 0.4.3.1-alpha. + - The configure script now shows whether or not lzma and zstd have + been used, not just if the enable flag was passed in. Fixes bug + 40236; bugfix on 0.4.3.1-alpha. o Minor bugfixes (compatibility): - - Fix a failure in the test cases when running on the hppa + - Fix a failure in the test cases when running on the "hppa" architecture, along with a related test that might fail on other architectures in the future. Fixes bug 40274; bugfix on 0.2.5.1-alpha. @@ -145,8 +145,8 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 most circumstances. Fixes bug 19011; bugfix on 0.2.2.10-alpha. o Minor bugfixes (ipv6): - - Allow non-SOCKSPorts to disable IPv4, IPv6, and Prefer IPv4. Some - rare configs might break, but in this case you can disable + - Allow non-SOCKSPorts to disable IPv4, IPv6, and PreferIPv4. Some + rare configurations might break, but in this case you can disable NoIPv4Traffic and NoIPv6Traffic as needed. Fixes bug 33607; bugfix on 0.4.1.1-alpha. Patch by Neel Chauhan. @@ -163,15 +163,16 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 o Minor bugfixes (relay): - Reduce the compression level for data streaming from HIGH to LOW. + This should reduce the CPU and memory burden for directory caches. Fixes bug 40301; bugfix on 0.3.5.1-alpha. o Code simplification and refactoring: - Remove the orconn_ext_or_id_map structure and related functions. - Nothing outside of unit tests looks up anything in this structure. - Closes ticket 33383. Patch by Neel Chauhan. + (Nothing outside of unit tests used them.) Closes ticket 33383. + Patch by Neel Chauhan. o Code simplification and refactoring (metrics, DoS): - - Move the DoS subsystem into the subsys manager including its + - Move the DoS subsystem into the subsys manager, including its configuration options. Closes ticket 40261. o Removed features (relay):

1 0

[community/master] Merge remote-tracking branch 'goodiec/patch-1'
by emmapeel＠torproject.org 18 Mar '21

18 Mar '21

commit b21d2b5d3eebc00077e14bb5674bb9d7a01082a6 Merge: 38a039d 4518f47 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 18 16:38:43 2021 +0100 Merge remote-tracking branch 'goodiec/patch-1' will-close: https://gitlab.torproject.org/tpo/web/community/-/issues/158 content/localization/translation-problem/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[community/master] Updated "Report a problem with a translation" page
by emmapeel＠torproject.org 18 Mar '21

18 Mar '21

commit 4518f47a894d7220a7178c4882084f83e9125163 Author: Goodiec <goodnesschrisugari(a)yahoo.com> Date: Sat Oct 10 22:09:03 2020 +0100 Updated "Report a problem with a translation" page Updated "Report a problem with a translation" page --- content/localization/translation-problem/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 26ce65a..430aafd 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -19,7 +19,7 @@ body: ### Reporting an error with a translation * If you are already a [Tor translator](../becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). -* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Translations** component. - Before opening a ticket, see the currently [open tickets for Translations](https://trac.torproject.org/projects/tor/query?status=accepte… because maybe it is already reported. +* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Localization** repository. + Before opening a ticket, see the currently [open tickets for Translations](https://github.com/torproject/community/tree/master/content/l… because maybe it is already reported. * You can send an email to the [tor localization mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n). * You can report such issues on [irc](https://support.torproject.org/get-in-touch/#irc-help), on the #tor-l10n channel on the oftc network (you may need to be registered to log in).

1 0

[tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.14
by gk＠torproject.org 18 Mar '21

18 Mar '21

commit 4eb612dea332b0cea783267ec55790d88846b74c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Mar 18 15:17:17 2021 +0000 Release preparation for 10.0.14 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 3 ++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index 035ccca..0830aa0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.8.0 + firefox_platform_version: 78.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: 'browser/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 426c0c3..617a77a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 10.0.14 -- March 23 2021 + * Windows + OS X + Linux + * Update Firefox to 78.9.0esr + * Update NoScript to 11.2.3 + * Update Tor to 0.4.5.7 + * Bug 40031: Remove survey banner on TB-stable [torbutton] + * Build System + * Windows + * Bug 40249: Bump mingw-w64 and clang for Firefox 78.9 [tor-browser-build] + Tor Browser 10.0.13 -- March 3 2021 * Linux * Bug 40328: Fix instability after upgrading to glibc 2.33 [tor-browser] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index acd0dff..20d920d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a + sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index ab5458a..edd6391 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.5.6 +version: 0.4.5.7 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index ba4baa0..e0e2c7b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.13' + torbrowser_version: '10.0.14' torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0.12 + - 10.0.13 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-10.0-desktop] Bug 40249: Bump mingw-w64 and clang for Firefox 78.9
by sysrqb＠torproject.org 18 Mar '21

18 Mar '21

commit 3797da9b1363edeb6866b85e7685813edeef325c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 16 11:04:08 2021 +0100 Bug 40249: Bump mingw-w64 and clang for Firefox 78.9 https://hg.mozilla.org/releases/mozilla-esr78/rev/1b0e1f0d885e https://hg.mozilla.org/releases/mozilla-esr78/rev/d726d74daa39 https://hg.mozilla.org/releases/mozilla-esr78/rev/cc840a008393 --- projects/binutils/config | 5 + projects/clang-source/build | 10 +- projects/clang-source/config | 9 +- projects/clang-source/no-seh.patch | 145 -------------------------- projects/clang/build | 2 + projects/clang/config | 14 +++ projects/mingw-w64-clang/build | 4 + projects/mingw-w64-clang/config | 3 +- projects/mingw-w64-clang/mingw-dwrite_3.patch | 84 +++++++++++++++ projects/mingw-w64/config | 2 +- 10 files changed, 122 insertions(+), 156 deletions(-) diff --git a/projects/binutils/config b/projects/binutils/config index 2367280..ad341ed 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -7,6 +7,11 @@ var: use_container: 1 targets: + # We use the windows-clang target for the binutils we use for building + # clang during windows builds. See projects/clang/config. + windows-clang: + var: + configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' windows: var: configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-deterministic-archives' diff --git a/projects/clang-source/build b/projects/clang-source/build index d94fcbe..227d614 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -10,22 +10,18 @@ tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] mv llvm-[% c("version") %].src llvm +[% IF ! c("var/windows") -%] # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. patch -p1 < $rootdir/43909.patch +[% END -%] mv clang-[% c("version") %].src llvm/tools/clang # Having clang-tidy available seems like a good idea mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra mv libcxx-[% c("version") %].src llvm/projects/libcxx mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi mv lld-[% c("version") %].src llvm/tools/lld -[% IF c("var/windows-i686") %] - # mingw-w64 does not support SEH on 32bit systems. Make it possible to - # explicitly disable it. - cd llvm/tools - patch -p1 < $rootdir/no-seh.patch - cd ../../ -[% END %] + mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ diff --git a/projects/clang-source/config b/projects/clang-source/config index 8adb18e..a6dce85 100644 --- a/projects/clang-source/config +++ b/projects/clang-source/config @@ -4,6 +4,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' gpg_keyring: clang.gpg sig_ext: sig +targets: + windows: + # We use clang 11 for Windows builds: + # https://hg.mozilla.org/releases/mozilla-esr78/rev/cc840a008393 + version: 11.0.1 + input_files: - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' name: llvm @@ -30,5 +36,4 @@ input_files: name: libunwind file_gpg_id: 1 - filename: 43909.patch - - filename: no-seh.patch - enable: '[% c("var/windows-i686") %]' + enable: '[% ! c("var/windows") %]' diff --git a/projects/clang-source/no-seh.patch b/projects/clang-source/no-seh.patch deleted file mode 100644 index 1a52e40..0000000 --- a/projects/clang-source/no-seh.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 38cbe873d45cf3c881ef4113b48193edfd418f43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Mon, 27 Jul 2020 23:44:41 +0300 -Subject: [PATCH] Implement the --no-seh flag - -Previously this flag was just ignored. If set, set the -IMAGE_DLL_CHARACTERISTICS_NO_SEH bit, regardless of the normal safeSEH -machinery. - -In mingw configurations, the safeSEH bit might not be set in e.g. object -files built from handwritten assembly, making it impossible to use the -normal safeseh flag. As mingw setups don't generally use SEH on 32 bit -x86 at all, it should be fine to set that flag bit though - hook up -the existing GNU ld flag for controlling that. - -Differential Revision: https://reviews.llvm.org/D84701 - -diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h -index 4b62cd05f4f..17ea0f8bcab 100644 ---- a/lld/COFF/Config.h -+++ b/lld/COFF/Config.h -@@ -135,6 +135,7 @@ struct Configuration { - bool safeSEH = false; - Symbol *sehTable = nullptr; - Symbol *sehCount = nullptr; -+ bool noSEH = false; - - // Used for /opt:lldlto=N - unsigned ltoo = 2; -diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp -index 15d6fb5121a..b569df07601 100644 ---- a/lld/COFF/Driver.cpp -+++ b/lld/COFF/Driver.cpp -@@ -1574,9 +1574,10 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) { - config->wordsize = config->is64() ? 8 : 4; - - // Handle /safeseh, x86 only, on by default, except for mingw. -- if (config->machine == I386 && -- args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw)) -- config->safeSEH = true; -+ if (config->machine == I386) { -+ config->safeSEH = args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw); -+ config->noSEH = args.hasArg(OPT_noseh); -+ } - - // Handle /functionpadmin - for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt)) -diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td -index 024b7be8f78..c7e2a5ea57e 100644 ---- a/lld/COFF/Options.td -+++ b/lld/COFF/Options.td -@@ -171,6 +171,7 @@ def include_optional : Joined<["/", "-", "/?", "-?"], "includeoptional:">, - HelpText<"Add symbol as undefined, but allow it to remain undefined">; - def kill_at : F<"kill-at">; - def lldmingw : F<"lldmingw">; -+def noseh : F<"noseh">; - def output_def : Joined<["/", "-", "/?", "-?"], "output-def:">; - def pdb_source_path : P<"pdbsourcepath", - "Base path used to make relative source file path absolute in PDB">; -diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp -index 5736281958f..aead781d38b 100644 ---- a/lld/COFF/Writer.cpp -+++ b/lld/COFF/Writer.cpp -@@ -1352,7 +1352,7 @@ template <typename PEHeaderTy> void Writer::writeHeader() { - pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF; - if (config->integrityCheck) - pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY; -- if (setNoSEHCharacteristic) -+ if (setNoSEHCharacteristic || config->noSEH) - pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH; - if (config->terminalServerAware) - pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE; -diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp -index be1b757e45b..1d292817cfb 100644 ---- a/lld/MinGW/Driver.cpp -+++ b/lld/MinGW/Driver.cpp -@@ -249,6 +249,8 @@ bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) { - add("-kill-at"); - if (args.hasArg(OPT_appcontainer)) - add("-appcontainer"); -+ if (args.hasArg(OPT_no_seh)) -+ add("-noseh"); - - if (args.getLastArgValue(OPT_m) != "thumb2pe" && - args.getLastArgValue(OPT_m) != "arm64pe" && !args.hasArg(OPT_dynamicbase)) -diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td -index 86400433d04..931cf264837 100644 ---- a/lld/MinGW/Options.td -+++ b/lld/MinGW/Options.td -@@ -45,6 +45,7 @@ def minor_subsystem_version_eq: Joined<["--"], "minor-subsystem-version=">, - Alias<minor_subsystem_version>; - def no_insert_timestamp: F<"no-insert-timestamp">, - HelpText<"Don't include PE header timestamp">; -+def no_seh: F<"no-seh">, HelpText<"Set the 'no SEH' flag in the executable">; - def no_whole_archive: F<"no-whole-archive">, - HelpText<"No longer include all object files for following archives">; - def large_address_aware: Flag<["--"], "large-address-aware">, -@@ -104,7 +105,6 @@ def: Flag<["--"], "full-shutdown">; - def: F<"high-entropy-va">; - def: S<"major-image-version">; - def: S<"minor-image-version">; --def: F<"no-seh">; - def: F<"nxcompat">; - def: F<"pic-executable">; - def: S<"plugin">; -diff --git a/lld/test/COFF/noseh.s b/lld/test/COFF/noseh.s -new file mode 100644 -index 00000000000..44295228622 ---- /dev/null -+++ b/lld/test/COFF/noseh.s -@@ -0,0 +1,19 @@ -+# REQUIRES: x86 -+# RUN: llvm-mc -triple i686-w64-mingw32 %s -filetype=obj -o %t.obj -+# RUN: lld-link -lldmingw %t.obj -out:%t.exe -entry:main -+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s --check-prefix=DEFAULT -+# RUN: lld-link -lldmingw %t.obj -out:%t.noseh.exe -entry:main -noseh -+# RUN: llvm-readobj --file-headers %t.noseh.exe | FileCheck %s --check-prefix=NOSEH -+ -+# DEFAULT: Characteristics [ -+# DEFAULT-NOT: IMAGE_DLL_CHARACTERISTICS_NO_SEH -+# DEFAULT: ] -+ -+# NOSEH: Characteristics [ -+# NOSEH: IMAGE_DLL_CHARACTERISTICS_NO_SEH -+# NOSEH: ] -+ -+ .text -+ .globl _main -+_main: -+ ret -diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test -index b8bc2ddea8a..1d53205927b 100644 ---- a/lld/test/MinGW/driver.test -+++ b/lld/test/MinGW/driver.test -@@ -204,3 +204,7 @@ APPCONTAINER: -appcontainer - RUN: ld.lld -### -m i386pep foo.o -delayload user32.dll --delayload shell32.dll | FileCheck -check-prefix DELAYLOAD %s - RUN: ld.lld -### -m i386pep foo.o -delayload=user32.dll --delayload=shell32.dll | FileCheck -check-prefix DELAYLOAD %s - DELAYLOAD: -delayload:user32.dll -delayload:shell32.dll -+ -+RUN: ld.lld -### -m i386pe foo.o -no-seh | FileCheck -check-prefix NOSEH %s -+RUN: ld.lld -### -m i386pe foo.o --no-seh | FileCheck -check-prefix NOSEH %s -+NOSEH: -noseh --- -2.28.0 - diff --git a/projects/clang/build b/projects/clang/build index 33688e5..d4be3de 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -10,6 +10,8 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] ln -s gcc /var/tmp/dist/gcc/bin/cc +[% END -%] +[% IF c("var/linux") || c("var/windows") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] diff --git a/projects/clang/config b/projects/clang/config index 46d308a..623d213 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -6,6 +6,12 @@ var: container: use_container: 1 +targets: + windows: + # We use clang 11 for Windows builds: + # https://hg.mozilla.org/releases/mozilla-esr78/rev/cc840a008393 + version: 11.0.1 + input_files: - project: container-image - name: '[% c("var/compiler") %]' @@ -14,6 +20,14 @@ input_files: - name: binutils project: binutils enable: '[% c("var/linux") %]' + # We build our own binutils as the one from buster has a regression: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953423 + # https://sourceware.org/bugzilla/show_bug.cgi?id=24458 + - name: binutils + project: binutils + enable: '[% c("var/windows") %]' + target_prepend: + - windows-clang - project: cmake name: cmake - project: clang-source diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 44a913f..974d2a9 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -60,6 +60,7 @@ default_win32_winnt=0x601 cd $builddir/mingw-w64-clang patch -p1 < $rootdir/mingw-winrt.patch +patch -p1 < $rootdir/mingw-dwrite_3.patch cd mingw-w64-headers mkdir build && cd build @@ -164,6 +165,9 @@ cmake -DCMAKE_BUILD_TYPE=Release \ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx +# the build expects ../llvm to exist so we add a symlink +# See https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… +ln -s /var/tmp/build/clang-source /var/tmp/build/clang-source/projects/llvm cd $builddir/clang-source/projects/libcxx mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 1bf5954..080c75b 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 +git_hash: 660e09f3cb20f181b6d6435cb623d65a3922a063 version: '[% c("abbrev") %]' var: @@ -23,3 +23,4 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch + - filename: mingw-dwrite_3.patch diff --git a/projects/mingw-w64-clang/mingw-dwrite_3.patch b/projects/mingw-w64-clang/mingw-dwrite_3.patch new file mode 100644 index 0000000..7c7b8c9 --- /dev/null +++ b/projects/mingw-w64-clang/mingw-dwrite_3.patch @@ -0,0 +1,84 @@ +From 86f4e9cbb5d3099179dc51332970d61d394116f6 Mon Sep 17 00:00:00 2001 +From: Sanketh Menda <me(a)snkth.com> +Date: Sat, 17 Oct 2020 15:39:42 -0400 +Subject: [PATCH] dwrite_3.h: rename GetGlyphImageFormats_ to + GetGlyphImageFormats + +Wine's WIDL currently doesn't support overloading functions, so till +that is fixed patch dwrite_3.h to rename GlyphImageFormats_ to +GetGlyphImageFormats. +--- + mingw-w64-headers/include/dwrite_3.h | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/mingw-w64-headers/include/dwrite_3.h b/mingw-w64-headers/include/dwrite_3.h +index 427c39e3b..dd894a8b1 100644 +--- a/mingw-w64-headers/include/dwrite_3.h ++++ b/mingw-w64-headers/include/dwrite_3.h +@@ -8168,7 +8168,7 @@ DEFINE_GUID(IID_IDWriteFontFace4, 0x27f2a904, 0x4eb8, 0x441d, 0x96,0x78, 0x05,0x + MIDL_INTERFACE("27f2a904-4eb8-441d-9678-0563f53e3e2f") + IDWriteFontFace4 : public IDWriteFontFace3 + { +- virtual HRESULT STDMETHODCALLTYPE GetGlyphImageFormats_( ++ virtual HRESULT STDMETHODCALLTYPE GetGlyphImageFormats( + UINT16 glyph, + UINT32 ppem_first, + UINT32 ppem_last, +@@ -8468,7 +8468,7 @@ typedef struct IDWriteFontFace4Vtbl { + WINBOOL *are_local); + + /*** IDWriteFontFace4 methods ***/ +- HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats_)( ++ HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats)( + IDWriteFontFace4 *This, + UINT16 glyph, + UINT32 ppem_first, +@@ -8549,7 +8549,7 @@ interface IDWriteFontFace4 { + #define IDWriteFontFace4_AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) (This)->lpVtbl->AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) + #define IDWriteFontFace4_AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) (This)->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) + /*** IDWriteFontFace4 methods ***/ +-#define IDWriteFontFace4_GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) ++#define IDWriteFontFace4_GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) + #define IDWriteFontFace4_GetGlyphImageFormats(This) (This)->lpVtbl->GetGlyphImageFormats(This) + #define IDWriteFontFace4_GetGlyphImageData(This,glyph,ppem,format,data,context) (This)->lpVtbl->GetGlyphImageData(This,glyph,ppem,format,data,context) + #define IDWriteFontFace4_ReleaseGlyphImageData(This,context) (This)->lpVtbl->ReleaseGlyphImageData(This,context) +@@ -8692,8 +8692,8 @@ static FORCEINLINE HRESULT IDWriteFontFace4_AreGlyphsLocal(IDWriteFontFace4* Thi + return This->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local); + } + /*** IDWriteFontFace4 methods ***/ +-static FORCEINLINE HRESULT IDWriteFontFace4_GetGlyphImageFormats_(IDWriteFontFace4* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) { +- return This->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats); ++static FORCEINLINE HRESULT IDWriteFontFace4_GetGlyphImageFormats(IDWriteFontFace4* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) { ++ return This->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats); + } + static FORCEINLINE DWRITE_GLYPH_IMAGE_FORMATS IDWriteFontFace4_GetGlyphImageFormats(IDWriteFontFace4* This) { + return This->lpVtbl->GetGlyphImageFormats(This); +@@ -9020,7 +9020,7 @@ typedef struct IDWriteFontFace5Vtbl { + WINBOOL *are_local); + + /*** IDWriteFontFace4 methods ***/ +- HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats_)( ++ HRESULT (STDMETHODCALLTYPE *GetGlyphImageFormats)( + IDWriteFontFace5 *This, + UINT16 glyph, + UINT32 ppem_first, +@@ -9121,7 +9121,7 @@ interface IDWriteFontFace5 { + #define IDWriteFontFace5_AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) (This)->lpVtbl->AreCharactersLocal(This,characters,count,enqueue_if_not,are_local) + #define IDWriteFontFace5_AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) (This)->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local) + /*** IDWriteFontFace4 methods ***/ +-#define IDWriteFontFace5_GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats) ++#define IDWriteFontFace5_GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) (This)->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats) + #define IDWriteFontFace5_GetGlyphImageFormats(This) (This)->lpVtbl->GetGlyphImageFormats(This) + #define IDWriteFontFace5_GetGlyphImageData(This,glyph,ppem,format,data,context) (This)->lpVtbl->GetGlyphImageData(This,glyph,ppem,format,data,context) + #define IDWriteFontFace5_ReleaseGlyphImageData(This,context) (This)->lpVtbl->ReleaseGlyphImageData(This,context) +@@ -9270,8 +9270,8 @@ static FORCEINLINE HRESULT IDWriteFontFace5_AreGlyphsLocal(IDWriteFontFace5* Thi + return This->lpVtbl->AreGlyphsLocal(This,glyphs,count,enqueue_if_not,are_local); + } + /*** IDWriteFontFace4 methods ***/ +-static FORCEINLINE HRESULT IDWriteFontFace5_GetGlyphImageFormats_(IDWriteFontFace5* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) { +- return This->lpVtbl->GetGlyphImageFormats_(This,glyph,ppem_first,ppem_last,formats); ++static FORCEINLINE HRESULT IDWriteFontFace5_GetGlyphImageFormats(IDWriteFontFace5* This,UINT16 glyph,UINT32 ppem_first,UINT32 ppem_last,DWRITE_GLYPH_IMAGE_FORMATS *formats) { ++ return This->lpVtbl->GetGlyphImageFormats(This,glyph,ppem_first,ppem_last,formats); + } + static FORCEINLINE DWRITE_GLYPH_IMAGE_FORMATS IDWriteFontFace5_GetGlyphImageFormats(IDWriteFontFace5* This) { + return This->lpVtbl->GetGlyphImageFormats(This); diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index b0ace13..c5dde82 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 +git_hash: 660e09f3cb20f181b6d6435cb623d65a3922a063 version: '[% c("abbrev") %]' var: container:

1 0

[tor/master] Fold new entries into 0.4.6.1-alpha ChangeLog
by nickm＠torproject.org 18 Mar '21

18 Mar '21

commit ded8f9b37882525f71a82e20a6b6c1b3ebb5d23e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 18 09:51:37 2021 -0400 Fold new entries into 0.4.6.1-alpha ChangeLog --- ChangeLog | 17 +++++++++++++++++ changes/bug40222 | 6 ------ changes/bug40285_045 | 4 ---- changes/ticket40228 | 4 ---- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9d8df1566..e4c0dc431e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,13 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 operator know why their relay hasn't been voted on. Closes ticket 40255. Patch by Neel Chauhan. + o Major features (metrics): + - Relays now report how overloaded they are in their extra-info + documents. This information is controlled with the + OverloadStatistics torrc option, and it will be used to improve + decisions about the network's load balancing. Implements proposal + 328; closes ticket 40222. + o Major features (relay, denial of service): - Add a new DoS subsystem feature to control the rate of client connections for relays. Closes ticket 40253. @@ -81,6 +88,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 - Add the stream ID argument to the event line in the ADDRMAP control event. Closes ticket 40249. Patch by Neel Chauhan. + o Minor features (dormant mode): + - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained + control over whether the client ever becomes dormant from + inactivity. Most people won't need this. Closes ticket 40228. + o Minor features (logging): - Change the DoS subsystem heartbeat line format so be more clear on what has been detected/rejected and which option is disabled if @@ -120,6 +132,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18 architectures in the future. Fixes bug 40274; bugfix on 0.2.5.1-alpha. + o Minor bugfixes (controller): + - Fix a "BUG" warning that would appear when a controller chooses + the first hop for a circuit, and that circuit completes. Fixes bug + 40285; bugfix on 0.3.2.1-alpha. + o Minor bugfixes (directory authorities, voting): - Add a new consensus method (31) to support any future changes that authorities decide to make to the value of bwweightscale or diff --git a/changes/bug40222 b/changes/bug40222 deleted file mode 100644 index 8338ea4a7b..0000000000 --- a/changes/bug40222 +++ /dev/null @@ -1,6 +0,0 @@ - o Major features (metrics): - - Introduce a new class of extra-info statistics that allows relays to - expose details of how overloaded they are. This information is controlled - using the OverloadStatistics torrc option, and it will be used to make - more informed decisions about the network's load balancing. Implements - proposal 328; closes ticket 40222. diff --git a/changes/bug40285_045 b/changes/bug40285_045 deleted file mode 100644 index db4f73cde0..0000000000 --- a/changes/bug40285_045 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (controller): - - Fix a "BUG" warning that would appear when a controller chooses the - first hop for a circuit, and that circuit completes. Fixes - bug 40285; bugfix on 0.3.2.1-alpha. diff --git a/changes/ticket40228 b/changes/ticket40228 deleted file mode 100644 index 297204decd..0000000000 --- a/changes/ticket40228 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (dormant mode): - - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained - control over whether the client ever becomes dormant from inactivity. - Most people won't need this. Closes ticket 40228.

1 0

[tor/master] Fix compiler warning about signed/unsigned conversion.
by nickm＠torproject.org 18 Mar '21

18 Mar '21

commit 80da1761a624686e25223b64f5832eab9249568b Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 17 20:03:39 2021 +0200 Fix compiler warning about signed/unsigned conversion. ``` src/feature/stats/rephist.c: In function ‘overload_happened_recently’: src/feature/stats/rephist.c:215:21: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] if (overload_time > approx_time() - 3600 * n_hours) { ``` from https://gitlab.torproject.org/tpo/core/tor/-/issues/40341#note_2729364 --- src/feature/stats/rephist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index fb97e0d255..7c0c28804c 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -209,7 +209,7 @@ static overload_stats_t overload_stats; /** Return true if this overload happened within the last `n_hours`. */ static bool -overload_happened_recently(time_t overload_time, unsigned n_hours) +overload_happened_recently(time_t overload_time, int n_hours) { /* An overload is relevant if it happened in the last 72 hours */ if (overload_time > approx_time() - 3600 * n_hours) {

1 0

[styleguide/master] Create README.md
by hiro＠torproject.org 18 Mar '21

18 Mar '21

commit c39aa2b8d1df217f313019b00a82e00addf08e98 Author: ephemeralwaves <thinkcolorful(a)thinkcolorful.org> Date: Wed Mar 17 15:51:45 2021 -0400 Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +

1 0

[styleguide/master] Update README.md
by hiro＠torproject.org 18 Mar '21

18 Mar '21

commit 86d3fbdcf03838df9485f3134bdf80335028ba72 Author: ephemeralwaves <thinkcolorful(a)thinkcolorful.org> Date: Wed Mar 17 20:29:11 2021 +0000 Update README.md --- README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/README.md b/README.md index 8b13789..dd039db 100644 --- a/README.md +++ b/README.md @@ -1 +1,52 @@ +# Style Guide +The Tor Styleguide is based on [Bootstrap](https://getbootstrap.com/), an open-source toolkit for developing with HTML, CSS, and JS. We are currently [implementing v4.0.0-beta.2](https://github.com/twbs/bootstrap/releases/tag/v4.0.0-beta.2). + +You can also clone this repository and use our CSS or SASS files. SASS is a CSS extension language. Bootstrap and this styleguide are based on v3.5.4. + +If you want to use SASS you can download the complete archive for the styleguide. The scss folder under assets contains all the sass files. Since we use bootstrap, we only add a few styles without modifying bootstrap core or defining new elements whenever possible. These are _tor_variables.scss and _tor.scss. These are imported in the main bootstrap scss file and compiled into the final css. + +## About + +Bootstrap contains a few JavaScript libraries for extra interaction with the DOM. We use these libraries but do not add extra JavaScript. You might notice that if you run Tor Browser with high security mode, JavaScript is disabled by default. This styleguide is designed to also work for users using Tor Browser in high security mode, so that only few elements are affected if you disable JavaScript. + +## Getting Started + +These instructions will get you a copy of the project up and running on your local machine. This styleguide has been built using [Lektor](https://www.getlektor.com/). Lektor is a static content management system. You can build this yourself by installing Lektor. + + +### Prerequisites + +What things you need to install the software +- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) +- [lektor](https://www.getlektor.com/docs/installation/) + +### Installing + +Get the code by running: +``` +git clone [repo address] +``` + +You must run two commands to pull the submodule: + +``` +git submodule init +``` +then + +``` +git submodule update +``` + + +### Run/Build With + +``` +lektor server +``` + + +## Extras + +We also provide a minimal Lektor template website that you can start modifying. This is available at this [repository](https://gitweb.torproject.org/project/web/template.git/).

1 0