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

[Git][tpo/applications/fenix][tor-browser-89.1.1-10.5-1] 2 commits: squash! Modify UI/UX
by Matthew Finkel (＠sysrqb) 15 Jun '21

15 Jun '21

Matthew Finkel pushed to branch tor-browser-89.1.1-10.5-1 at The Tor Project / Applications / fenix Commits: 416bcf65 by Matthew Finkel at 2021-06-15T14:34:24+00:00 squash! Modify UI/UX Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray - - - - - dca9b30b by Matthew Finkel at 2021-06-15T14:34:27+00:00 squash! Modify UI/UX Bug 40167: Hide "Save to Collection" in menu - - - - - 3 changed files: - app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt - app/src/main/res/layout/component_tabstray2.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -472,13 +472,13 @@ open class DefaultToolbarMenu( onItemTapped.invoke(ToolbarMenu.Item.AddToTopSites) } - val saveToCollectionItem = BrowserMenuImageText( - label = context.getString(R.string.browser_menu_save_to_collection_2), - imageResource = R.drawable.ic_tab_collection, - iconTintColorResource = primaryTextColor() - ) { - onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection) - } + //val saveToCollectionItem = BrowserMenuImageText( + // label = context.getString(R.string.browser_menu_save_to_collection_2), + // imageResource = R.drawable.ic_tab_collection, + // iconTintColorResource = primaryTextColor() + //) { + // onItemTapped.invoke(ToolbarMenu.Item.SaveToCollection) + //} val settingsItem = BrowserMenuHighlightableItem( label = context.getString(R.string.browser_menu_settings), @@ -575,7 +575,7 @@ open class DefaultToolbarMenu( //addToHomeScreenItem.apply { visible = ::canAddToHomescreen }, //installToHomescreen.apply { visible = ::canInstall }, addToTopSitesItem, - saveToCollectionItem, + //saveToCollectionItem, BrowserMenuDivider(), settingsItem, if (shouldDeleteDataOnQuit) deleteDataOnQuit else null, ===================================== app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt ===================================== @@ -4,7 +4,9 @@ package org.mozilla.fenix.tabstray +import android.view.View import androidx.annotation.VisibleForTesting +import androidx.core.view.isGone import com.google.android.material.tabs.TabLayout import mozilla.components.browser.state.store.BrowserStore import mozilla.components.support.base.feature.LifecycleAwareFeature @@ -36,6 +38,15 @@ class TabLayoutMediator( tabLayout.addOnTabSelectedListener(observer) selectActivePage() + + // Find normal mode tabs and set visibility + tabLayout.getTabAt(POSITION_NORMAL_TABS)?.getCustomView()?.apply { + // The View we get from getCustomView() is only a sub-component + // of the actual tab (for example, the tab-count box). We need + // the "Custom View"'s parent for controlling the visibility + // of the entire tab. + (getParent() as? View)?.isGone = true + } } override fun stop() { ===================================== app/src/main/res/layout/component_tabstray2.xml ===================================== @@ -101,14 +101,6 @@ android:contentDescription="@string/tabs_header_private_tabs_title" android:icon="@drawable/ic_private_browsing" /> - <com.google.android.material.tabs.TabItem - android:id="@+id/synced_tab_item" - android:layout_width="0dp" - android:layout_height="match_parent" - android:contentDescription="@string/tabs_header_synced_tabs_title" - android:foregroundTint="@color/photonWhite" - android:icon="@drawable/ic_synced_tabs" /> - </com.google.android.material.tabs.TabLayout> <ImageButton View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f48f4d47eff9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f48f4d47eff9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.18
by sysrqb＠torproject.org 15 Jun '21

15 Jun '21

commit 4cc5b98635a7ae7f56fb60dd46dde9af0d022f2d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 15 01:09:17 2021 +0000 Release preparation for 10.0.18 Versions bump and Changelog update --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ projects/tor/config | 2 +- rbm.conf | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9af7938..56586f2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 10.0.18 -- June 16 2021 + * Windows + OS X + Linux + * Update Tor to 0.4.5.9 + Tor Browser 10.0.17 -- June 1 2021 * Windows + OS X + Linux * Update Firefox to 78.11.0esr diff --git a/projects/tor/config b/projects/tor/config index bef0afc..ffc1e98 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.8 +version: 0.4.5.9 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 7cd3dec..d438e1f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.17' + torbrowser_version: '10.0.18' torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0.16 + - 10.0.17 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 15 Jun '21

15 Jun '21

commit 61db648c83746f77dd3f4004cef8f471b331c241 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 15 12:15:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- in/torbrowser_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/in/torbrowser_strings.xml b/in/torbrowser_strings.xml index 732f95ee44..3220d03954 100644 --- a/in/torbrowser_strings.xml +++ b/in/torbrowser_strings.xml @@ -71,7 +71,7 @@ <string name="tor_security_level_safest_description">Hanya izinkan fitur website yang mengharuskan untuk situs statis dan layanan dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.</string>  - <string name="tor_spoof_english">Minta halaman web versi bahasa Inggris untuk peningkatan privasi</string> + <string name="tor_spoof_english">Meminta halaman web versi bahasa Inggris untuk peningkatan privasi</string> <string name="tor_useamask_usetor">Gunakan masker, gunakan Tor.</string> <string name="tor_resistsurveillance">Lawan pandemi pengawasan.</string>

1 0

[status-site/main] Mark metrics.tpo disruption as resolved
by gk＠torproject.org 15 Jun '21

15 Jun '21

commit 4371551d5518a19a900a2db55ec937504f8f5d66 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 15 07:57:44 2021 +0000 Mark metrics.tpo disruption as resolved --- content/issues/2021-06-05-metris-website.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/issues/2021-06-05-metris-website.md b/content/issues/2021-06-05-metris-website.md index 738eb88..66efab6 100644 --- a/content/issues/2021-06-05-metris-website.md +++ b/content/issues/2021-06-05-metris-website.md @@ -1,7 +1,8 @@ --- title: Disruption of Metrics website and relay search date: 2021-06-03 08:00:00 -resolved: false +resolved: true +resolvedWhen: 2021-06-14 16:00:00 # Possible severity levels: down, disrupted, notice severity: disrupted affected:

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Jun '21

15 Jun '21

commit b94f9772e0ed5d3bfc59e777fb4fc2215c9bcd10 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 15 06:18:01 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+bn.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index 954c108b06..181ad4ea71 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -8,6 +8,7 @@ # Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2020 # Emma Peel, 2021 # Mohammad Shariful Islam <toha.aug29(a)gmail.com>, 2021 +# Foxom Toto <foxomot957(a)coalamails.com>, 2021 # msgid "" msgstr "" @@ -15,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-08 20:18+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Mohammad Shariful Islam <toha.aug29(a)gmail.com>, 2021\n" +"Last-Translator: Foxom Toto <foxomot957(a)coalamails.com>, 2021\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -132,24 +133,24 @@ msgstr "দেবিয়ান রিপোসিটোরি" #: https//support.torproject.org/rpm/ (content/rpm/contents+en.lrtopic.title) msgid "Tor rpm packages" -msgstr "" +msgstr "টর আরপিএম প্যাকেজ" #: https//support.torproject.org/abuse/ #: (content/abuse/contents+en.lrtopic.title) msgid "Abuse FAQ" -msgstr "" +msgstr "অপব্যবহার প্রাজিপ্র" #: https//support.torproject.org/metrics/ #: (content/metrics/contents+en.lrtopic.title) #: https//support.torproject.org/glossary/metrics/ #: (content/glossary/metrics/contents+en.lrword.term) msgid "Tor Metrics" -msgstr "" +msgstr "টর পরিসংখ্যান" #: https//support.torproject.org/glossary/add-on-extension-or-plugin/ #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.term) msgid "add-on, extension, or plugin" -msgstr "" +msgstr "অ্যাড-অন, এক্সটেনশন, অথবা প্লাগিন" #: https//support.torproject.org/glossary/add-on-extension-or-plugin/ #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.definition) @@ -245,7 +246,7 @@ msgstr "" #: https//support.torproject.org/glossary/bridge/ #: (content/glossary/bridge/contents+en.lrword.term) msgid "bridge" -msgstr "" +msgstr "সেতু" #: https//support.torproject.org/glossary/bridge/ #: (content/glossary/bridge/contents+en.lrword.definition) @@ -276,7 +277,7 @@ msgstr "" #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.term) msgid "browser fingerprinting" -msgstr "" +msgstr "ব্রাউজার আঙ্গুলছাপ" #: https//support.torproject.org/glossary/browser-fingerprinting/ #: (content/glossary/browser-fingerprinting/contents+en.lrword.definition) @@ -358,7 +359,7 @@ msgstr "" #: https//support.torproject.org/glossary/circuit/ #: (content/glossary/circuit/contents+en.lrword.term) msgid "circuit" -msgstr "" +msgstr "বর্তনী" #: https//support.torproject.org/glossary/circuit/ #: (content/glossary/circuit/contents+en.lrword.definition) @@ -376,7 +377,7 @@ msgstr "" #: https//support.torproject.org/glossary/client/ #: (content/glossary/client/contents+en.lrword.term) msgid "client" -msgstr "" +msgstr "গ্রাহক" #: https//support.torproject.org/glossary/client/ #: (content/glossary/client/contents+en.lrword.definition) @@ -389,7 +390,7 @@ msgstr "" #: https//support.torproject.org/glossary/compass/ #: (content/glossary/compass/contents+en.lrword.term) msgid "Compass" -msgstr "" +msgstr "কম্পাস" #: https//support.torproject.org/glossary/compass/ #: (content/glossary/compass/contents+en.lrword.definition) @@ -415,7 +416,7 @@ msgstr "" #: https//support.torproject.org/glossary/cookie/ #: (content/glossary/cookie/contents+en.lrword.term) msgid "cookie" -msgstr "" +msgstr "কুকি" #: https//support.torproject.org/glossary/cookie/ #: (content/glossary/cookie/contents+en.lrword.definition) @@ -434,7 +435,7 @@ msgstr "" #: https//support.torproject.org/glossary/cross-site-scripting-xss-/ #: (content/glossary/cross-site-scripting-xss-/contents+en.lrword.term) msgid "cross-site scripting (XSS)" -msgstr "" +msgstr "ক্রস-সাইট স্ক্রিপটিং (এক্সএসএস)" #: https//support.torproject.org/glossary/cross-site-scripting-xss-/ #: (content/glossary/cross-site-scripting-xss-/contents+en.lrword.definition) @@ -446,7 +447,7 @@ msgstr "" #: https//support.torproject.org/glossary/cryptographic-signature/ #: (content/glossary/cryptographic-signature/contents+en.lrword.term) msgid "cryptographic signature" -msgstr "" +msgstr "সাংকেতিক স্বাক্ষর" #: https//support.torproject.org/glossary/cryptographic-signature/ #: (content/glossary/cryptographic-signature/contents+en.lrword.definition) @@ -470,7 +471,7 @@ msgstr "" #: https//support.torproject.org/glossary/daemon/ #: (content/glossary/daemon/contents+en.lrword.term) msgid "daemon" -msgstr "" +msgstr "ডিমন" #: https//support.torproject.org/glossary/daemon/ #: (content/glossary/daemon/contents+en.lrword.definition)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 15 Jun '21

15 Jun '21

commit 61ebb7b963308f96f2a1f8e80567fdaeb12074fe Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 15 06:15:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+bn.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index c362dcf807..91e65fb338 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -1,6 +1,5 @@ # # Translators: -# Foxom Toto <foxomot957(a)coalamails.com>, 2020 # nr072, 2020 # Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2021 # Mohammad Shariful Islam <toha.aug29(a)gmail.com>, 2021 @@ -9,6 +8,7 @@ # erinm, 2021 # code smite <codesmite(a)gmail.com>, 2021 # Emma Peel, 2021 +# Foxom Toto <foxomot957(a)coalamails.com>, 2021 # msgid "" msgstr "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-20 18:03+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: Foxom Toto <foxomot957(a)coalamails.com>, 2021\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16397,7 +16397,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/fedora/ #: (content/relay/setup/bridge/fedora/contents+en.lrpage.section) msgid "bridge" -msgstr "" +msgstr "সেতু" #: https//community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/ #: (content/relay/setup/bridge/centos-rhel-opensuse/contents+en.lrpage.body)

1 0

[tpo/master] Closes #198 Remove post Fundraising Coordinator job position from the website
by gus＠torproject.org 14 Jun '21

14 Jun '21

commit f529ebf93865f6521babf7cc93fdf5e2281acdbc Author: gus <gus(a)torproject.org> Date: Mon Jun 14 16:53:14 2021 -0300 Closes #198 Remove post Fundraising Coordinator job position from the website --- content/about/jobs/fundraising-coordinator/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/jobs/fundraising-coordinator/contents.lr b/content/about/jobs/fundraising-coordinator/contents.lr index bff26bb6..556dcd9c 100644 --- a/content/about/jobs/fundraising-coordinator/contents.lr +++ b/content/about/jobs/fundraising-coordinator/contents.lr @@ -6,7 +6,7 @@ section: about --- section_id: about --- -active: yes +active: False --- color: primary ---

1 0

[tor/main] Add a MinTimeToReportBandwidth option; make it 0 for testing networks.
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 17 08:45:37 2021 -0400 Add a MinTimeToReportBandwidth option; make it 0 for testing networks. This option changes the time for which a bandwidth measurement period must have been in progress before we include it when reporting our observed bandwidth in our descriptors. Without this option, we only consider a time period towards our maximum if it has been running for a full day. Obviously, that's unacceptable for testing networks, where we'd like to get results as soon as possible. For non-testing networks, I've put a (somewhat arbitrary) 2-hour minimum on the option, since there are traffic analysis concerns with immediate reporting here. Closes #40337. --- changes/ticket40337 | 12 ++++++++++++ doc/man/tor.1.txt | 7 +++++++ src/app/config/config.c | 8 ++++++++ src/app/config/config.h | 7 +++++++ src/app/config/or_options_st.h | 4 ++++ src/app/config/testnet.inc | 1 + src/feature/stats/bwhist.c | 19 ++++++++++++++----- src/feature/stats/bwhist.h | 2 +- src/test/test_relay.c | 4 ++-- 9 files changed, 56 insertions(+), 8 deletions(-) diff --git a/changes/ticket40337 b/changes/ticket40337 new file mode 100644 index 0000000000..f8f136a740 --- /dev/null +++ b/changes/ticket40337 @@ -0,0 +1,12 @@ + o Minor features (bandwidth reporting): + - Relays can now use the MinTimeToReportBandwidth option to change + the smallest amount of time over which they're willing to report + their observed maximum bandwidth. Previously, this was fixed + at 1 day. For safety, values under 2 hours are only supported on + testing networks. Part of a fix for ticket 40337. + + o Minor features (testing): + - Relays on testing networks now report their observed bandwidths + immediately from startup. Previously, they waited + until they had been running for a full day. Closes ticket + 40337. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index b57c6ec70a..af4ee494ef 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2448,6 +2448,13 @@ is non-zero): If we have more onionskins queued for processing than we can process in this amount of time, reject new ones. (Default: 1750 msec) +[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: + Do not report our measurements for our maximum observed bandwidth for any + time period that has lasted for less than this amount of time. + Setting this option too low can enable traffic analysis, and is + not permitted except on testing networks. Values over 1 day have + no effect. (Default: 1 day) + [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...:: Declare that this Tor relay is controlled or administered by a group or organization identical or similar to that of the other relays, defined by diff --git a/src/app/config/config.c b/src/app/config/config.c index fa74907b3d..9011f36735 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -563,6 +563,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), + V(MinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3711,6 +3712,13 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } + if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW && + !options->TestingTorNetwork) { + log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; " + "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW); + options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW; + } + if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); diff --git a/src/app/config/config.h b/src/app/config/config.h index e95ef4a728..74e6942eb5 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -24,6 +24,13 @@ * expose more information than we're comfortable with. */ #define MIN_HEARTBEAT_PERIOD (30*60) +/** + * Lowest allowable value for MinTimeToReportBandwidth on a non-testing + * network; if this is too low we might report detail that is too + * fine-grained. + **/ +#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60) + /** Maximum default value for MaxMemInQueues, in bytes. */ #if SIZEOF_VOID_P >= 8 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 4364f145ed..efecc85d66 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1082,6 +1082,10 @@ struct or_options_t { /** List of policy allowed to query the Metrics port. */ struct config_line_t *MetricsPortPolicy; + /** How far must we be into the current bandwidth-measurement period to + * report bandwidth observations from this period? */ + int MinTimeToReportBandwidth; + /** * Configuration objects for individual modules. * diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 00b307782b..527e0d00b1 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -19,6 +19,7 @@ { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, +{ "MinTimeToReportBandwidth", "0 seconds" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, { "TestingServerConsensusDownloadInitialDelay", "0" }, diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index 7cbc5f60a6..55a8f7c747 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -206,16 +206,24 @@ bwhist_note_dir_bytes_read(uint64_t num_bytes, time_t when) add_obs(dir_read_array, when, num_bytes); } -/** Helper: Return the largest value in b->maxima. (This is equal to the +/** + * Helper: Return the largest value in b->maxima. (This is equal to the * most bandwidth used in any NUM_SECS_ROLLING_MEASURE period for the last * NUM_SECS_BW_SUM_IS_VALID seconds.) + * + * Also include the current period if we have been observing it for + * at least min_observation_time seconds. */ STATIC uint64_t -find_largest_max(bw_array_t *b) +find_largest_max(bw_array_t *b, int min_observation_time) { int i; uint64_t max; - max=0; + time_t period_start = b->next_period - NUM_SECS_BW_SUM_INTERVAL; + if (b->cur_obs_time > period_start + min_observation_time) + max = b->max_total; + else + max = 0; for (i=0; i<NUM_TOTALS; ++i) { if (b->maxima[i]>max) max = b->maxima[i]; @@ -233,8 +241,9 @@ MOCK_IMPL(int, bwhist_bandwidth_assess,(void)) { uint64_t w,r; - r = find_largest_max(read_array); - w = find_largest_max(write_array); + int min_obs_time = get_options()->MinTimeToReportBandwidth; + r = find_largest_max(read_array, min_obs_time); + w = find_largest_max(write_array, min_obs_time); if (r>w) return (int)(((double)w)/NUM_SECS_ROLLING_MEASURE); else diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h index f88b951447..01055df720 100644 --- a/src/feature/stats/bwhist.h +++ b/src/feature/stats/bwhist.h @@ -28,7 +28,7 @@ int bwhist_load_state(struct or_state_t *state, char **err); #ifdef BWHIST_PRIVATE typedef struct bw_array_t bw_array_t; -STATIC uint64_t find_largest_max(bw_array_t *b); +STATIC uint64_t find_largest_max(bw_array_t *b, int min_observation_time); STATIC void commit_max(bw_array_t *b); STATIC void advance_obs(bw_array_t *b); STATIC bw_array_t *bw_array_new(void); diff --git a/src/test/test_relay.c b/src/test/test_relay.c index b287f0d38b..8ed29b6282 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -98,7 +98,7 @@ test_relay_close_circuit(void *arg) tt_int_op(new_count, OP_EQ, old_count + 1); /* Ensure our write totals are 0 */ - tt_u64_op(find_largest_max(write_array), OP_EQ, 0); + tt_u64_op(find_largest_max(write_array, 86400), OP_EQ, 0); /* Mark the circuit for close */ circuit_mark_for_close(TO_CIRCUIT(orcirc), 0); @@ -107,7 +107,7 @@ test_relay_close_circuit(void *arg) advance_obs(write_array); commit_max(write_array); /* Check for two cells plus overhead */ - tt_u64_op(find_largest_max(write_array), OP_EQ, + tt_u64_op(find_largest_max(write_array, 86400), OP_EQ, 2*(get_cell_network_size(nchan->wide_circ_ids) +TLS_PER_CELL_OVERHEAD));

1 0

[tor/main] Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 265cca935aefd1a3bdbe6abc964858e10fb4a029 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 11 15:54:14 2021 -0400 Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks. Part of the ever-growing 40337 fix. --- changes/ticket40337 | 3 +++ src/feature/relay/router.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/ticket40337 b/changes/ticket40337 index 02ea29ffc1..1c86fc4c99 100644 --- a/changes/ticket40337 +++ b/changes/ticket40337 @@ -11,3 +11,6 @@ immediately from startup. Previously, they waited until they had been running for a full day. Closes ticket 40337. + - Relays on testing networks no longer rate-limit how frequently + they are willing to report new bandwidth measurements. Part of a fix + for ticket 40337. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 2696b8633b..c95f36aa8b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2599,7 +2599,10 @@ check_descriptor_bandwidth_changed(time_t now) if ((prev != cur && (!prev || !cur)) || cur > (prev * BANDWIDTH_CHANGE_FACTOR) || cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) { - if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { + const bool change_recent_enough = + last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now; + const bool testing_network = get_options()->TestingTorNetwork; + if (change_recent_enough || testing_network || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); mark_my_descriptor_dirty("bandwidth has changed");

1 0

[tor/main] Make MinTimeToReportBandwidth a testing-only option (and rename it)
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 11 15:49:00 2021 -0400 Make MinTimeToReportBandwidth a testing-only option (and rename it) --- changes/ticket40337 | 5 +++-- doc/man/tor.1.txt | 12 +++++------- src/app/config/config.c | 10 ++-------- src/app/config/config.h | 7 ------- src/app/config/or_options_st.h | 2 +- src/app/config/testnet.inc | 2 +- src/feature/stats/bwhist.c | 2 +- 7 files changed, 13 insertions(+), 27 deletions(-) diff --git a/changes/ticket40337 b/changes/ticket40337 index f8f136a740..02ea29ffc1 100644 --- a/changes/ticket40337 +++ b/changes/ticket40337 @@ -1,5 +1,6 @@ - o Minor features (bandwidth reporting): - - Relays can now use the MinTimeToReportBandwidth option to change + o Minor features (testing): + - On a testing network, relays can now use the + TestingMinTimeToReportBandwidth option to change the smallest amount of time over which they're willing to report their observed maximum bandwidth. Previously, this was fixed at 1 day. For safety, values under 2 hours are only supported on diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index af4ee494ef..209900832f 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2448,13 +2448,6 @@ is non-zero): If we have more onionskins queued for processing than we can process in this amount of time, reject new ones. (Default: 1750 msec) -[[MinTimeToReportBandwidth]] **MinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: - Do not report our measurements for our maximum observed bandwidth for any - time period that has lasted for less than this amount of time. - Setting this option too low can enable traffic analysis, and is - not permitted except on testing networks. Values over 1 day have - no effect. (Default: 1 day) - [[MyFamily]] **MyFamily** __fingerprint__,__fingerprint__,...:: Declare that this Tor relay is controlled or administered by a group or organization identical or similar to that of the other relays, defined by @@ -3602,6 +3595,11 @@ The following options are used for running a testing Tor network. Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) +[[TestingMinTimeToReportBandwidth]] **TestingMinTimeToReportBandwidth** __N__ **seconds**|**minutes**|**hours**:: + Do not report our measurements for our maximum observed bandwidth for any + time period that has lasted for less than this amount of time. + Values over 1 day have no effect. (Default: 1 day) + [[TestingServerConsensusDownloadInitialDelay]] **TestingServerConsensusDownloadInitialDelay** __N__:: Initial delay in seconds for when servers should download consensuses. Changing this requires that **TestingTorNetwork** is set. (Default: 0) diff --git a/src/app/config/config.c b/src/app/config/config.c index 9011f36735..88da7a0aa7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -563,7 +563,7 @@ static const config_var_t option_vars_[] = { V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), VPORT(MetricsPort), V(MetricsPortPolicy, LINELIST, NULL), - V(MinTimeToReportBandwidth, INTERVAL, "1 day"), + V(TestingMinTimeToReportBandwidth, INTERVAL, "1 day"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), @@ -3712,13 +3712,6 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD; } - if (options->MinTimeToReportBandwidth < MIN_MIN_TIME_TO_REPORT_BW && - !options->TestingTorNetwork) { - log_warn(LD_CONFIG, "MinTimeToReportBandwidth is too short; " - "raising to %d seconds.", MIN_MIN_TIME_TO_REPORT_BW); - options->MinTimeToReportBandwidth = MIN_MIN_TIME_TO_REPORT_BW; - } - if (options->KeepalivePeriod < 1) REJECT("KeepalivePeriod option must be positive."); @@ -3994,6 +3987,7 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) CHECK_DEFAULT(TestingSigningKeySlop); CHECK_DEFAULT(TestingAuthKeySlop); CHECK_DEFAULT(TestingLinkKeySlop); + CHECK_DEFAULT(TestingMinTimeToReportBandwidth); or_options_free(dflt_options); } #undef CHECK_DEFAULT diff --git a/src/app/config/config.h b/src/app/config/config.h index 74e6942eb5..e95ef4a728 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -24,13 +24,6 @@ * expose more information than we're comfortable with. */ #define MIN_HEARTBEAT_PERIOD (30*60) -/** - * Lowest allowable value for MinTimeToReportBandwidth on a non-testing - * network; if this is too low we might report detail that is too - * fine-grained. - **/ -#define MIN_MIN_TIME_TO_REPORT_BW (2*60*60) - /** Maximum default value for MaxMemInQueues, in bytes. */ #if SIZEOF_VOID_P >= 8 #define MAX_DEFAULT_MEMORY_QUEUE_SIZE (UINT64_C(8) << 30) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index efecc85d66..440c987365 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1084,7 +1084,7 @@ struct or_options_t { /** How far must we be into the current bandwidth-measurement period to * report bandwidth observations from this period? */ - int MinTimeToReportBandwidth; + int TestingMinTimeToReportBandwidth; /** * Configuration objects for individual modules. diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 527e0d00b1..039454a0d0 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -19,7 +19,7 @@ { "TestingV3AuthInitialDistDelay", "20 seconds" }, { "TestingAuthDirTimeToLearnReachability", "0 minutes" }, { "MinUptimeHidServDirectoryV2", "0 minutes" }, -{ "MinTimeToReportBandwidth", "0 seconds" }, +{ "TestingMinTimeToReportBandwidth", "0 seconds" }, { "TestingServerDownloadInitialDelay", "0" }, { "TestingClientDownloadInitialDelay", "0" }, { "TestingServerConsensusDownloadInitialDelay", "0" }, diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c index 55a8f7c747..06ad48e5c3 100644 --- a/src/feature/stats/bwhist.c +++ b/src/feature/stats/bwhist.c @@ -241,7 +241,7 @@ MOCK_IMPL(int, bwhist_bandwidth_assess,(void)) { uint64_t w,r; - int min_obs_time = get_options()->MinTimeToReportBandwidth; + int min_obs_time = get_options()->TestingMinTimeToReportBandwidth; r = find_largest_max(read_array, min_obs_time); w = find_largest_max(write_array, min_obs_time); if (r>w)

1 0