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

[sbws/maint-1.1] fix: CI: Replace tor 0.4.6 by 0.4.7.
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 198de57cfcfc96fd8347b61bfffe256c2631e574 Author: juga0 <juga(a)riseup.net> Date: Fri Apr 16 08:14:21 2021 +0000 fix: CI: Replace tor 0.4.6 by 0.4.7. Cause of tpo/tpa/team#40221. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da457b3..d352153 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ python37tormaster: variables: BASE_IMAGE: python:3.7 RELEASE: tor-nightly-master-buster - TOR: tor=0.4.6* + TOR: tor=0.4.7* image: $BASE_IMAGE script: - tox -e py37

1 0

[sbws/maint-1.1] fix: Clarify release script dependencies
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 99505e2c3ee182158cb201094dc84f9b28298fa6 Author: juga0 <juga(a)riseup.net> Date: Wed Apr 14 08:32:15 2021 +0000 fix: Clarify release script dependencies --- scripts/maint/release.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/maint/release.py b/scripts/maint/release.py index 17f5788..1ca4ba6 100755 --- a/scripts/maint/release.py +++ b/scripts/maint/release.py @@ -41,12 +41,15 @@ import sys try: import semantic_version except ImportError: - print("Please, install semantic_version") + print( + "Please, install semantic_version: " + "`apt install python3-semantic-version` or " + "`pip install semantic_version`") sys.exit(1) try: import gitchangelog # noqa except ImportError: - print("Please, install gitchangelog") + print("Please, install gitchangelog: `pip install gitchangelog`") sys.exit(1) import sbws

1 0

[sbws/maint-1.1] fix: CI: Create release on tag
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 316d67fe132bc774ba7bff20ddf298aa947bce98 Author: juga0 <juga(a)riseup.net> Date: Fri Apr 16 09:51:13 2021 +0000 fix: CI: Create release on tag --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d352153..1a9ad10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,3 +131,20 @@ python310: - tox -e py310 - tox -e integration allow_failure: true + +release_job: + before_script: + - echo "Nothing" + after_script: + - echo "Nothing" + image: registry.gitlab.com/gitlab-org/release-cli:latest + only: [tags] + script: + - echo "Running release job." + release: + name: "Release $CI_COMMIT_TAG" + description: "Created using release-cli" + tag_name: "$CI_COMMIT_TAG" + ref: "$CI_COMMIT_TAG" + milestones: + - "sbws: 1.1.x-final"

1 0

[sbws/maint-1.1] Prepare release version 1.2.0.
by juga＠torproject.org 16 Apr '21

16 Apr '21

commit 9e165ce63acf8edc805736dad963528c24033ef7 Author: juga0 <juga(a)riseup.net> Date: Wed Apr 14 08:35:17 2021 +0000 Prepare release version 1.2.0. Update changelog, updated automatically, manually fixed typos and and new lines. Closes #40004. --- CHANGELOG.rst | 607 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 607 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bc55b15..7969a47 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,613 @@ The format is based on `Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`__ and this project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__. +1.2.0 +----- + +New +~~~ +- Docs: Include script on how to release. +- Scripts: Add script to help new releases. +- Add gitchangelog template. +- Add gitchangelog configuration file. +- Docs: Add bwauths list image. +- Relaylist: Keep relays not in last consensus. + Keep the relays that are not in the the last consensus, but are not + "old" yet. +- Util: Add function to know if timestamp is old. + Part of #30727. + +Changes +~~~~~~~ +- Stem: Set default torrc options. + when connecting to an external tor and they are not already set. +- Generate, cleanup: Use 28 days of measurements. + When generating the Bandwidth File as Torflow, use 28 days of past raw + measurements instead of 5, by default. + Also keep the raw measurements for that long before compressing or + deleting them. + And stop checking whether the compression and delete + periods are valid, without checking defaults first and based on + arbitrary values. +- Stem: Add function to connect or start tor. + Move initialization via existing socket to this new function and start + tor only when it fails. +- Stem, scanner: Change args initializing controller. + to check whether the external control port configuration is set. + There is no need to assert all argument options nor to return the error. +- Config: Add option to connect to external tor. + via control port. +- Circuitbuilder: Remove not used attributes. + and make argument optional. +- Circuitbuilder: Simplify building circuit. + Since sbws is only building 2 hop paths, there is no need to add random + relays to the path, or convert back and forth between fingerprint and + ``Relay`` objects. + This will eliminate the circuit errors: + - Tor seems to no longer think XXX is a relay + - Can not build a circuit, no path. + - Can not build a circuit with the current relays. + If a relay is not longer running when attempting to build the circuit, + it will probably fail with one of the other circuit errors: TIMEOUT, + DESTROYED or CHANNEL_CLOSED. +- Scanner: Stop storing recent_measurement_attempt. + because it stores a timestamp for each attempt, which makes state.dat + grow thousand of lines (json). + Closes #40023, #40020 +- V3bwfile: Exclude relays without observed bw. + and without consensus bw from scaling. + Part of #33871, closes #33831. +- V3bwfile: Percentage difference with consensus. +- V3bwfile: Calculate hlimit from scaled sum bw. + instead of bw before scaling. + Tests have finally correct value. + For 1 result, only when the cap is 1, the value will be equal to the + rounded bw because the cap does not limit it. +- V3bwfile: Obtain consensus values from last consensus. +- V3bwfile: Round scaled bandwidth after capping. + Make tests pass because the high limit change the expected values, + but the final value still needs to be fixed. +- V3bwfile: Change logic obtaining min bandwidth. + Take either the consenus bandwidth or the descriptor bandwidth if + one of them is missing, do not scale when both are missing and + ignore descriptor average and burst when they are missing. +- V3bwfile: Scale relays missing descriptor bws. + Scale relays without average or observed bandwidth. + Later it will be check what to do if their values are None or 0 +- V3bwfile: Stop making mean minimum 1. +- V3bwfile: Calculate filtered bandwidth. + for each relay, calculate the filtered mean for all relays and + calculate the filtered ratio for each relay. +- Scaling: Add filtered bandwidth function. + to calculate the filtered bandwidth for each relay. +- Bwfile: Test KeyValues in a bandwidth file. + Added: + - library to check whether the KeyValues make sense + - test an example bandwidth file + - a command to check an arbitrary bandwidth file + Finally, doing something with all these KeyValues! + (Quarantine day 7th) +- V3bwfile: Count recent relay's monitoring numbers. + using timestamps class. + Also add one more result to the tests data and change the + test accordingly. +- Tests: Remove `_count` from attr. +- Resultdump: Add missing attrs to errors. +- Resultdump: Remove `_count` from attributes. + Tests wont' pass with this commit, they'll be fixed in the next commits +- Relayprioritizer: Count priorities with timestamps. + in RelayPrioritizer: + + - Rename recent_priority_list_count to recent_priority_list when + there is no counting + - Rename recent_priority_relay_count to recent_priority_relay + when there is no counting + - Use the timestamps class to manage/count priority lists/relays +- Relaylist: Count measurements with timestamps. + in RelayList: + + - Rename recent_measurement_attempt_count to recent_measurement_attempt when + there is no counting + - Use the timestamps class to manage/count measurement attempts +- Relaylist, v3bwfile: Count consensus with timestamps. + in RelayList: + + - Rename consensus_timestamps to recent_consensus + - Rename recent_consensus_count to recent_consensus when there is + no counting + - Use the timestamps class to manage/count consensuses + - Remove method not needed anymore +- V3bwfile: Convert datetime to str. +- Resultdump: Use custom json encoder/decoder. +- State: Encode/decode datetimes. +- Json: Create custom JSON encoder/decoder. + to be able to serialize/deserialize datetime in the state file. +- Timestamps: Add module to manage datetime sequences. +- State: Add method to count list values. + +Fix +~~~ +- Clarify release script dependencies. +- Use rst changelog template. + and put in the same entry commit subject and body removing new lines. +- Correct network stream and filtered bw. + because Torflow is not using them by relay type. +- V3bwfile: network means without relay type. + This reverts commit fc3d3b992ada601a6255f8a6889179abd4b7e55e and partially + reverts a82c26184097bea3ca405ae19773de7c4354a541. + It was a mistake to think torflow was using the means by relay type, + it actually sets the same networks means for all relay types. + Closes #40080. +- Semi-automatic correction of typos. + Closes #33599. +- Tests: Add codespell configuration. +- Tests: Additional security tests. +- CI: Use all tox environments for python 3.8. +- 2nd round of automatic format. + black insists to keep one long line and flake complain, therefore make + flake to ignore it. +- Flake8 errors. +- Reorder imports with isort. +- Reformat all with black. +- Move to declarative setup.cfg. + Also: + - Update versioneer + - And include other source distribution files in MANIFEST.in + - Add project URLs + - Add formatter and linter dependencies and configurations. + - tox: Remove travis, fix python environments + - tox: Remove extra coverage options and add them in .coveragerc. +- Indent by default to 2 except python files. + also uncomment final newline. Can be commented again in case it fails +- V3bwfile: network means by relay type. + Calculate network stream and filtered bandwidth averages per relay + type, to obtain bandwidth weights the same way as Torflow. + Closes #40059. +- Scaling: Return mean if no bw >= mean. +- Scaling: Stop returning 1 as the means minima. + since they are used as the numerator when calculating the ratio and the + rounding already returns a minimum of 1. +- Scaling: Return if there are no measurements. + it should not be the case because the measurements come from + successful results, but otherwise it'd throw an exception. +- Tests: Add bw filtered from results. +- Scaling: round bandwidth filtered. + because Torflow does it. +- Scanner: Return from measure if no helper. + After refactoring in #40041, it was forgotten to return the error in + the case a helper was not found, what can happen in test networks. + Closes #40065. +- Tests: debug log for tests by default. + and fix test that didn't consider that there might be other logs from + other threads. + Closes #33797. +- Scanner: Log times kept. + not only the times that are not kept. + Closes #40060 +- CI: Temporal workaround for #40072. +- Relalist: Use the consensus timestamp. + to the relay consensus timestamps list, so that it can be + tested it was in a concrete consensus. +- CI: Exit from integration script. + when any of the commands fail. +- CI: Update Python versions. + Closes #40055. +- CI: Update tor versions. +- System physical requirements. + After fixing #40017, the datadir files are compressed after 29 days and + deleted after 57. However the total used disk space is less than 3G, + leaving 3G as precaution. + Closes #40044. +- Scanner: Return from measure if no helper. + After refactoring in #40041, it was forgotten to return the error in + the case a helper was not found, what can happen in test networks. + Closes #40065. +- Update differences Torflow/sbws. + Closes #40056 +- Reorganize Torflow aggregation. + - reorganize sections + - add diagrams and links + - add pseudocode + - remove math + - correct statements + So that it's more accurate and easier to understand. +- Docs: Rename section, add diagrams. +- Separate Torflow/sbws differences. + into a new file. +- Add target to call plantuml. + and generate .svg from .puml files. + Do not add to the html target since the generated svg images are + not deterministic and will change every time `plantuml` is call. +- Separate how scanner and generator work. + in different files and link to each other. +- Add missing new lines. +- CI: Make wget quiet. + to avoid many lines of non useful text the CI. +- Scanner: Rm condition assigning helper. +- Scanner: Move as_entry/as_exit into one function. + since they're similar code +- Scanner: remove relay to measure as helper. +- Scanner: log exit policy when stream fails. +- Relaylist: Remove duplicated can exit methods. + After refactoring and making clear when we were using exit(s) that can + exit to all public IPs (and a port) or only some, refactor them + removing the duplicated code and adding the `strict` argument. +- Add relay measure activity diagram. +- Scanner: extract method on circuit error. + At some point all possible errors should be exceptions. +- Scanner: extract method for not helper case. +- Scanner: extract method to create paths. + because `measure_relay` method is too long, confusing and we have had + several bugs in this part of the code. +- Relaylist: Add methods to obtain exits that. + can exit to some IPs. + To use them in the cases it will be more convenient. +- Relaylist: rename exits_not_bad_allowing_port. + see previous commit +- Relaylist: rename is_exit_not_bad_allowing_port. + see previous commit +- Relaylist: rename can_exit_to_port. + to can_exit_to_port_all_ips, because it's using `strict`, which means + that it allows to exit to all IPs. + It seems more convenient to try first with exits that allow to + exit to some IPs and only try a second time if that fails, because + there are more. +- Resultdump: Check that the error has a circuit. + Because if the error is not a circuit error, it does not have that + attribute. +- Tests: Run integration tests with chutney. + and adapt the tests to pass. + \o/ +- Add chutney configuration. + and scripts to run the integration tests with chutney. + It does not replace yet the way integration tests are run. +- Stem: Move torrc option that does not depend on config. + It seems we forgot this option when refactoring in #28738. +- Stem: Remove torrc option that is the default. + to avoid conflict when comparing the options that should be set and the + ones are set, since the SocksPort will be differently in chutney. +- Resultdump: Log if relay was measured as exit. + or entry. + Closes #40048 +- Relaylist: Stop measuring relays not in the consenus. + as this might cause many circuit errors. + They're already added to the generator. + Also adapt the number in test_init_relays. +- Sphinx warnings when creating documentation. + This should give us at least a clean html, text, and man build + experience. + Closes #40036. +- Add forgotten image from consensus health. + It was referenced by 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d. Since that + image was wrong, created a new screenshot from the current "past 90 + days" at consensus-health.tpo. +- Stem: Add possible exception cause. +- Stem: Remove unused code. +- Stem: Exit on failure connecting to control port. + because when trying to connect to an external tor (chutney), it does + not make sense to start own tor. + Also log how the connection has been made. +- Update values in config_tor.rst + clean-up. + Closes #40035. +- Update default values in man_sbws.ini.rst. + Closes #40034. +- Clean up config.rst. + Closes #40033. +- Scanner: Retry to measure exit as exit. + if it fails to be measured as entry. + Mayb closes: #40029. +- Relaylist: Comment on IPv6 exit policy. + that could be also checked, increasing the chances that the exit can + exit to our Web servers. + But if it could not, then we need to retry to measure it as 1st hop. +- Config: Increment circuit build timeout. + setting it to the default, 60secs. + Since many relays fail to be measured cause of circuit timeout. + Maybe closes #40029. +- Bump bandwidth file version to 1.5.0. + after removing KeyValue recent_measurement_attempt_count in #40023. + Changed also torspec, issue #20. +- V3bwfile: Tor version added in bandwidth v1.4.0. + since, by mistake, the bandwidth file version here was never updated + to v1.5.0. + This patch only changes the constants names, but logic remains the same. + Related to torspec#35. +- Add the bwauths timeline wiki. + Closes #40013. +- Add bwauthealth tool. +- Add consensus health page. + about bwauths measured relays. +- Move consensus weight to top. + and explain what to check. +- V3bwfile: Take all measurements when IP changes. + Previously, when a relay changes IP, only the measurements with the + last IP were considered. + Relays with dynamic IP could get unmeasured that way. + Now, all the measurements are considered. +- V3bwfile: Avoid statistics without data. + If mean or median argument is empty, they throw an exception. + This can happen when the scanner has stopped and the result is + stored as successful without any downloads. +- No need to use Travis anymore. +- Clarify branch to use when contributing. +- Maint: Fix linter error after merging #29294. +- Tests: Stop converting boolean key to int. + Conversion only happens when parsing a bandwidth file in the + integration tests. +- Relaylist: filter out private networks. + when checking exit policies to know whether an exit can exit to a port. +- Update authors. +- Replace docs links from Github to Gitlab. +- Update reviewers. +- Replace Github review process to Gitlab. + Replace also Github terminology to Gitlab. +- Replace Trac, ticket by Gitlab, issue. +- Replace links from Trac to Gitlab. +- Start using release script later. + Change the version from which the release script is used. + Also explain the prefixes used in the commits. + Closes #29294 +- Scripts: Clarify the scope of the script. + it should not take more effort than solving self-sbws issues. +- Scripts: Reformat sentence. +- Scripts: Stop bumping to next prerelease version. + since it is now managed automatically by versioneer. + Instead, suggest creating a "next" maintenance branch. + But stop using `-` and `.` characters in it, to type it faster, since + most of the new branches will be based on it. +- Scripts: Stop releasing from -dev0 version. + since now sbws version is calculated from last release tag. +- Scripts: Stop changing version in __init__ + Since it is now done by `versioneer`. +- Scripts: Change Github by Gitlab. + releases can live now in gitlab.tpo, instead of github.com and + there is no need to check them since Gitlab is FLOSS and gitlab.tpo is + hosted by Tor Project. + Also, stop assuming which is the current branch and remote and do not + push. Instead guide the maintainer to do it. +- CI: Add .gitlab-ci.yml to run tests in Gitlab. +- Relaylist: Check exit to all domains/ips. + When an exit policy allows to exit only to some subnet, it is not + enough to check that it can exit to a port, since it can, but it might + not be able to exit to the domain/ip of the sbws Web servers. + To ensure that without having to check whether it can exit to a + specific domain/ip, we can query the exit policy with `strict`. + Closes #40006. Bugfix v1.0.3. +- V3bwfile: Count relay priority lists. + and measurement attempts from all the results. + Until they get properly updated. + Also change dates in tests, so that timestamps are counted correctly +- Recomment maint-1.1 for production. +- Recommend using a CDN, + add link to it and rephrase some sentences. +- Increase RAM required. + ahem, because of all json it has to manage in memory. +- Recommend pip only for development. + or testing and add links. +- Update supported Python versions. +- Comment on Debian/Ubuntu releases. + because sometimes the package might not be in Debian stable or testing + and we are not checking Ubuntu releases. +- Tests: Remove all the `\t` in torrc files. + at the beginning of the line and in empty lines. They are not needed. +- Tests: Create new authority keys. + because they expired. + They will expire again in a year. + Implementing #33150 and using chutney would avoid to update keys. + Closes #34394. +- V3bwfile: linter error with new flake version. +- Add differences between Torflow and sbws. + Closes #33871. +- Update/clarify Torflow aggregation. +- Docs: Remove unneeded linter exception. +- Docs: Move torflow scaling docstring to docs. + so that it has its own page as it is too long as docstring and is + harder to write latex with the docstring syntax. +- Unrelated linter error. +- V3bwfile: Remove unneeded minimum 1. + since rounding already returns 1 as minimum. +- V3bwfile: Use cap argument to clip scaled bw. + Make test pass, though the value is not correct since it needs to be + rounded after clipping +- V3bwfile: cap is never None. +- V3bwfile: Warn about None bandwidth values. + since they are probably due a bug. +- Check that log prints a number. + and not a list of timestamps. +- Assert that caplog messages were found. +- Explain changes in the previous commits. +- Tests: Check the files generated in test net. + Test that the results, state and bandwidth file generated by running + the scanner and the generator in the test network are correct. +- Tests: Add tests loading results. + in ResultDump and incrementing relay's monitoring KeyValues. +- Tests: Add results incrementing relays' + monitoring KeyValues. +- V3bwfile: Stop calculating failures with 0 attempts. +- Relaylist: Count recent relay's monitoring numbers. + using timestamps class. + Additionally: + - fix: relayprioritizer: Replace call relay priority + - fix: scanner: Replace call relay measurement attempt +- State: Let json manage data types. + Since state uses json and json will raise an error when it can't + decode/encode some datatype. +- State: Read file before setting key. + Otherwise, if other instance of state set a key, it's lost by the + current instance. + Bugfix v0.7.0. +- Tests: Test state file consistency. + Test that two different instances of state don't overwrite each other. + This test don't past in this commit, will pass in the next bugfix. + Bugfix v0.7.0, which claimed 100% test coverage on state. +- Tests: linter error cause missing nl. +- Relaylist: Update relay status before consensus. + Update relay status before updating the consensus timestamps + Timestamps that are not old yet were getting removed because the + document.valid_after timestamp was still the one from the previous + consensus. + Closes #33570. +- Tests: Test the number of consensus in Relay. + This test does not pass in this commit, but in the next bugfix. +- Relaylist: Use is_old fn removing consensus. + since the logic is the same and the there were two bugfixes on the + same logic. +- Relaylist: Use seconds removing consensuses. + by default days is passed to timedelta, what was making the oldest + date be thousands of days in the past. + Bugfix 1.1.0. +- Tests: Add relaylist test. + Tests don't pass in this commit, they're fixed in the next commits. +- Tests: Add mocked controller fixture. + to be able to unit test all the code that needs a controller. +- Tests: Add test for remove old consensus ts. + Tests don't pass in this commit, it's fixed in the next commits. +- Timestamp: measurements period is in seconds. + by default days is passed to timedelta, what was making the oldest + date be thousands of days in the past. +- Timestamp: Old timestamps are minor than older. + Old timestamps are minor than the older date, not major. +- Relaylist: Stop passing argument to self.is_old. +- Tests: Add test timestamp.is_old. + The tests don't pass in this commit, it's fixed in the next ones. +- V3bwfile: Reformat to don't get flake8 errors. + Part of #30196 +- V3bwfile: Move keys to correct constant. + Part of #30196. +- V3bwfile: Add comment about bwlines v1.3. + Part of #30196. +- V3bwfile: Add tor_version KeyValue. + + - Create new KeyValues constants for the new v1.5.0 KeyValues + - Instantiate State in Header.from_results so that there is no need + to create new methods for all the header KeyValues that are read + from the state file + - Add tor_version to the kwargs to initialize the Header + - Write tor_version in the state file when the scanner is started +- V3bwfile: Add constant for ordered key/values. + to build the list of all keys from it and ensure no key is missing. +- V3bwfile: Reformat to don't get flake8 errors. + After the automatic constants renaming, fix the flake8 errors by + reformatting automatically with `black`, only the lines that had + errors. + Part of #30196 +- Document why ersioneer to obtain version. +- Add at build time the git revion to version. + Instead of having a hardcoded version, calculate the version at build + time making use of `git describe --tags --dirty --always`. + This way, even if the program is not running from inside a git + repository it still can know which was the git revision from the + source it was installed from. + If the program is launched from a path that is a git repository, it + does not gives the git revision of that other repository. + If's also able to get the version when installed from a tarball. + It does not add the git revision when it's being install from a git + tag. + `versioneer` external program is only needed the first time, because + it copies itself into the repository. So it does not add an external + dependency. + There're no changes needed to the `--version` cli argument nor to the + code that generates the bandwidth file, since they both use the + variable `__version__`. + The version previous to this commit was `1.1.1-dev0`, after + this commit, it becomes `1.1.0+xx.gyyyyyyyy`, ie. xx commits after + `1.1.0` plus the git short hash (yyyyyyyy). +- Tests: Test maximum retry delta in destination. +- Destination: Replace constant name. + to make it consistent with others and shorter. + Part of #33033. +- Destination: Set maximum to retry a destination. + otherwise the time to retry a destination could increase too much, + as it's being multiplied by 2, and a destination would not recover. + Patch submitted by tom. +- Relaylist: linter error after after merge. + Fix linter error after merging #30733 and #30727. +- CI: Cache pip, run tox stats after success. + and do not require sudo. +- CI: Test all supported python versions. + As in chutney and stem: + - Test all supported python versions + - Test all supported tor versions + Differences between chutney, stem and sbws: + - in sbws we run directly, not an script that calls tox + - we're not using chutney for integration tests (yet) and therefore we're not testing it with different networks + - we don't have shellcheck tests + - we don't support osx nor windows +- Relaylist: Update the relays' descriptors. + when fetching new consensuses. + Part of #30733. +- Globals: Fetch descriptors early. + and useless descriptors, so that sbws detect early changes in the relay + descriptors and continue downloading them even when Tor is idle. + +Other +~~~~~ +- Wip: rm me, temporally change release url. + to personal fork, to test the release process +- Fixup! minor: Change info logs to debug or warning. +- Major: Change default log level to info. + also change formatting to show thread. +- Minor: Change log warning to info or debug. + when it contains sensitive information. +- Minor: Change info logs to debug or warning. + when they contain sensitive information, eg. Web server or are too + verbose for the debug level. + Also add log to indicate when the main loop is actually started. +- Revert "fix: stem: Remove torrc option that is the default" + This reverts commit 15da07d6a447d8310354124f6020b4cf74b75488. + Because it's not the default. No additional changes are needed in the + tests. + Closes #40064. +- Minor: scanner: Change logic creating the path. + When the relay is not an exit, instead of choosing exits that can + exit to all IPs, try with exits that can exit to some IPs, since the + relay will be measured again with a different exit in other loop. + When the relay is an exit, instead of ensuring it can exit all IPs, try + using it as exit if it can exit to some IPs. + If it fails connecting to the Web server, then try a 2nd time using it + as entry to avoid that it will fail in all loops if there is only one + Web server, cause it will be used again as an exit. + Also, the helper exits don't need to be able to exit all IPs. When a + helper exit fails to exit (maybe cause it can not exit to the Web + sever IP), it's not a problem cause in a next loop other exit will be + chosen. + This change of logic also solves the bug where non exits were being + used as exits, because we were trying to measure again a relay that + was used as entry, because it could not exit all IPs, which includes + also the non exits. +- Minor: scanner: move checking helper to methods. + `helper` variable is only used to return error, therefore move it to + the methods that create the path and return the error there. + `our_nick` is not useful for the log, since it is always the same, but + not removing it here. +- Vote on the relays with few or close measurements. + to vote on approximately the same numbers of relays as Torflow. + Torflow does not exclude relays with few or close measurements, though + it is possible that because of the way it measures, there are no few + or close measurements. + Closes #34393 +- Doc: fix: Update sbws availabity in OS and links. +- Bug 33009: Require minimum bandwidth for second hop. +- Use freeze_time() in other parts of our tests, too. + When using `_relays_with_flags()` and similar methods it's possible + that tests start to hang without time freezing. See bug 33748 for more + details. We work around this by providing the necessary `freeze_time()` + calls meanwhile. +- Bug 33600: `max_pending_results` is not directly used in `main_loop` +- Fixup! fix: CI: Test all supported python versions. +- Relaylist: stop using the current time when a consensus is downloaded twice. + Instead: + * use the consensus valid-after time, or + * use the supplied timestamp, or + * warn and use the current time. + This should fix the occasional CI failure, when the current time is 1 second + later than the test consensus time. (Or it should warn, and we can fix the + test code.) + Fixes bug 30909; bugfix on 1.1.0. +- V3bwfile: skip relay results when required bandwidths are missing. + Fixes bug 30747; bugfix on 1.1.0. +- Bump to version 1.1.1-dev0. + v1.1.0 (2019-03-27) -------------------

1 0

[sbws/maint-1.1] Merge remote-tracking branch 'gitlab/merge-requests/83' into maint-1.1
by juga＠torproject.org 16 Apr '21

16 Apr '21

1 0

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

15 Apr '21

commit af5b05b56f3158bb83ec07b1930e0d0c5d159842 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 15 20:15:10 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 19a696fd75..a583bc5c44 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -16715,11 +16715,13 @@ msgid "" "Don't forget to change the `ORPort`, `ServerTransportListenAddr`, " "`ContactInfo`, `<user>`, and `Nickname` options." msgstr "" +"لا تنسى تغيير ال`ORPort`, `ServerTransportListenAddr`, `ContactInfo`, " +"`<user>`, و `اسم الشهرة` الخيارات." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) msgid "* Use a fixed obfs4 port larger than 1024, still avoiding 9001." -msgstr "" +msgstr "* استخدم منفذ obfs4 ثابتًا أكبر من 1024، مع تجنب 9001." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16732,6 +16734,8 @@ msgid "" "Open up the Command Prompt App. Change your directory with: `cd " "C:\\Users\\<user>\\AppData\\Roaming\\tor\\`. Type: `tor.exe -f torrc`." msgstr "" +"افتح تطبيق موجه الأوامر. تغيير الدليل الخاص بك مع: `cd " +"C:\\Users\\<user>\\AppData\\Roaming\\tor\\`. صنف: `tor.exe -f torrc`." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16739,6 +16743,8 @@ msgid "" "To confirm your bridge is running with no issues, you should see something " "like this in `C:\\Users\\<user>\\AppData\\Roaming\\tor\\notice.log`." msgstr "" +"لتأكيد أن جسرك يعمل بدون مشاكل، يجب أن ترى شيئًا كهذا في " +"`C:\\Users\\<user>\\AppData\\Roaming\\tor\\notice.log`." #: https//community.torproject.org/relay/setup/bridge/dragonflybsd/ #: (content/relay-operations/technical-setup/bridge/dragonflybsd/contents+en.lrpage.title) @@ -19446,6 +19452,8 @@ msgid "" "The best resource of all is the active community of relay operators on tor-" "relays mailing list and on IRC #tor-relays in irc.oftc.net." msgstr "" +"أفضل مورد على الإطلاق هو المجتمع النشط لمشغلي الترحيل في قائمة مراسلات Tor " +"وعلى IRC #tor-relays in irc.oftc.net." #: (dynamic) msgid "Relay Operators mailing list" @@ -19624,19 +19632,19 @@ msgstr "تعديل هذه الصفحة" #: (dynamic) msgid "Onion Balance V3 Enhancements" -msgstr "" +msgstr "Onion Balance V3 تحسينات" #: (dynamic) msgid "OONI Probe network experiments" -msgstr "" +msgstr "تجارب شبكة OONI Probe" #: (dynamic) msgid "OONI: Implement roaming test helpers" -msgstr "" +msgstr "OONI: تنفيذ مساعدي اختبار التجوال" #: (dynamic) msgid "OONI: Measure the accuracy of OONI GeoIP lookup" -msgstr "" +msgstr "OONI: قم بقياس دقة بحث OONI GeoIP" #: (dynamic) msgid "Tor Weather" @@ -19648,17 +19656,19 @@ msgstr "أليكسا أعلى مواقع كلمة التحقق و Tor مراقب #: (dynamic) msgid "OONI: Integration and unit testing of OONI Probe Desktop apps" -msgstr "" +msgstr "OONI: تكامل واختبار الوحدة لتطبيقات OONI Probe لسطح المكتب" #: (dynamic) msgid "OONI: Improve OONI Explorer code quality" -msgstr "" +msgstr "OONI: تحسين جودة كود OONI إكسبلورر" #: (dynamic) msgid "" "Word of mouth is critical to reaching new people and helping them protect " "themselves online. Here's how you can help:" msgstr "" +"الكلام الشفهي أمر بالغ الأهمية للوصول إلى أشخاص جدد ومساعدتهم على حماية " +"أنفسهم عبر الإنترنت. إليك كيف يمكنك المساعدة:" #: (dynamic) msgid "Privacy and freedom are human rights." @@ -19705,6 +19715,7 @@ msgid "" "Tor software is developed by the Tor Project, a 501(c)(3) nonprofit " "organization." msgstr "" +"تم تطوير برنامج Tor بواسطة Tor مشروع ، وهي منظمة غير ربحية 501 (ج) (3)." #: (dynamic) msgid "We build free and open source software anyone can use."

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 15 Apr '21

15 Apr '21

commit 451aa35867c98123df0bf362143e267a52c1290c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 15 19:45:54 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+cs.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code_of_conduct+cs.po b/code_of_conduct+cs.po index 3811e9cb3d..eb4e864323 100644 --- a/code_of_conduct+cs.po +++ b/code_of_conduct+cs.po @@ -592,6 +592,12 @@ msgid "" "involved in any discussion or documentation of the incident. More about the " "Community Council can be found in the guidelines [2]." msgstr "" +"Pokud však máte pocit, že dochází ke střetu zájmů s jakýmkoli členem rady, " +"můžete členy kontaktovat jednotlivě. GPG klíče jednotlivý členů rady jsou " +"uvedeny ve wiki Community Councilu. Dojde-li ke střetu zájmů, dotčený člen " +"rady se sám vzdá funkce. Nebude se podílet na žádné diskusi ani dokumentaci " +"incidentu. Další informace o Community Councilu jsou dostupné v pokynech " +"[2]." #. type: Plain text #: ../code_of_conduct.txt:215 @@ -600,6 +606,8 @@ msgid "" "6. What to do if you witness unacceptable behavior\n" "============================================================\n" msgstr "" +"6. Co dělat, když jsem svědkem nepřijatelného chování\n" +"============================================================\n" #. type: Plain text #: ../code_of_conduct.txt:230 @@ -618,6 +626,18 @@ msgid "" "danger or harm to anyone. More information about the Community Council's " "incident reporting and response policies can be found on their wiki [1]." msgstr "" +"Pokud jsi vystaveni nebo jsi svědkem nepřijatelného chování nebo máš jiné " +"obavy, oznam to co nejdříve Community Councilu, který můžeš kontaktovat " +"osobně nebo na tor-community-council(a)lists.torproject.org. Aktuální členové " +"rady jsou uvedeni na wiki [1]. Reakce Community Councilu na mimořádné " +"události se bude lišit případ od případu. Council vyvine veškeré úsilí, aby " +"na incident okamžitě reagovala. Council bude upřednostňovat bezpečnost " +"osoby, která byla poškozena nebo jí hrozí újma. Osoby, které byly poškozeny " +"nebo jim hrozí újma, mohou zprávu o incidentu kdykoli stáhnout. Nikdy " +"nebudeme dělat nic bez souhlasu osoby, která byla poškozena nebo jí hrozí " +"újma, s výjimkou situací, kdy hrozí bezprostřední nebezpečí nebo újma " +"komukoli. Více informací o politikách Community Councilu pro hlášení " +"incidentů a reakce na ně lze nalézt na jejich wiki [1]." #. type: Plain text #: ../code_of_conduct.txt:233

1 0

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

15 Apr '21

commit db65381251014cddb03964b84d3cd3deef2b394b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 15 19:45:18 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ar.po | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 332cd585d3..19a696fd75 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -16622,6 +16622,10 @@ msgid "" "window. This creates the folder `C:\\Users\\<user>\\AppData\\Roaming\\tor\\`" " (where `<user>` is your user name)." msgstr "" +"افتح مجلد Tor على سطح المكتب الخاص بك. نقرتين متتاليتين `tor.exe`. بمجرد " +"قراءة موجه الأوامر: `[تنويه] بوتستراب 100٪ (منجز): منجز`, أغلق النافذة. هذا " +"يخلق المجلد `C:\\Users\\<user>\\AppData\\Roaming\\tor\\` (حيث `<user>` هو " +"اسم المستخدم الخاص بك)." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16629,6 +16633,8 @@ msgid "" "From the Tor folder on your desktop, select all `.dll`'s and `.exe`'s and " "cut/paste them into the `C:\\Users\\<user>\\AppData\\Roaming\\tor\\` folder." msgstr "" +"من مجلد Tor على سطح المكتب الخاص بك، حدد الكل `.dll`'s و `.exe`'s و " +"cut/paste them into the `C:\\Users\\<user>\\AppData\\Roaming\\tor\\` folder." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16637,6 +16643,9 @@ msgid "" " `geoip` and `geoip6` and cut/paste them into the " "`C:\\Users\\<user>\\AppData\\Roaming\\tor\\` folder." msgstr "" +"افتح مجلد البيانات على سطح المكتب الخاص بك. داخل مجلد Tor هذا، حدد كليهما " +"`geoip` and `geoip6` and cut/paste them into the " +"`C:\\Users\\<user>\\AppData\\Roaming\\tor\\` folder." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16646,6 +16655,10 @@ msgid "" "`obfs4proxy.exe` and cut/paste it into the " "`C:\\Users\\<user>\\AppData\\Roaming\\tor\\` folder." msgstr "" +"انتقل إلى `C:\\Users\\<user>\\Desktop\\Tor " +"Browser\\Browser\\TorBrowser\\Tor\\PluggableTransports`. اختار " +"`obfs4proxy.exe` وقم بقصها/ لصقها في ملف " +"`C:\\Users\\<user>\\AppData\\Roaming\\tor\\` ملف." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16659,6 +16672,9 @@ msgid "" "white space and select `New > Text Document`. Name the file `torrc`; there " "is no extension." msgstr "" +"في ال `C:\\Users\\<user>\\AppData\\Roaming\\tor\\` المجلد، انقر بزر الماوس " +"الأيمن على مساحة بيضاء وحدد`جديد > مستند نصي`. اسم الملف `torrc`; لا يوجد " +"تمديد." #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16666,21 +16682,23 @@ msgid "" "Double-click on the `torrc` file. When prompted *How do you want to open " "this file?*, select `Notepad`. Add the following:" msgstr "" +"انقر نقرًا مزدوجًا فوق `torrc` ملف. عندما يُطلب منك *كيف تريد فتح هذا " +"الملف?*, اختار `Notepad`. أضف ما يلي:" #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) msgid "Log notice file C:\\Users\\<user>\\AppData\\Roaming\\tor\\notice.log" -msgstr "" +msgstr "ملف إشعار السجل C:\\Users\\<user>\\AppData\\Roaming\\tor\\notice.log" #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) msgid "GeoIPFile C:\\Users\\<user>\\AppData\\Roaming\\tor\\geoip" -msgstr "" +msgstr "GeoIPFile C:\\Users\\<user>\\AppData\\Roaming\\tor\\geoip" #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) msgid "GeoIPv6File C:\\Users\\<user>\\AppData\\Roaming\\tor\\geoip6" -msgstr "" +msgstr "GeoIPv6File C:\\Users\\<user>\\AppData\\Roaming\\tor\\geoip6" #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -16688,6 +16706,8 @@ msgid "" "ServerTransportPlugin obfs4 exec " "C:\\Users\\<user>\\AppData\\Roaming\\tor\\obfs4proxy.exe" msgstr "" +"ServerTransportPlugin obfs4 exec " +"C:\\Users\\<user>\\AppData\\Roaming\\tor\\obfs4proxy.exe" #: https//community.torproject.org/relay/setup/bridge/windows/ #: (content/relay-operations/technical-setup/bridge/windows/contents+en.lrpage.body) @@ -19620,11 +19640,11 @@ msgstr "" #: (dynamic) msgid "Tor Weather" -msgstr "" +msgstr "Tor طقس" #: (dynamic) msgid "Alexa Top Sites Captcha and Tor Block Monitoring" -msgstr "" +msgstr "أليكسا أعلى مواقع كلمة التحقق و Tor مراقبة بلوك" #: (dynamic) msgid "OONI: Integration and unit testing of OONI Probe Desktop apps"

1 0

[community/staging] Better strings for localization
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 2b157385405cd36d83a70447c359b97672f23154 Author: gus <gus(a)torproject.org> Date: Tue Apr 13 15:36:50 2021 -0300 Better strings for localization --- content/user-research/guidelines/contents.lr | 21 +++++++++---- content/user-research/how-to-volunteer/contents.lr | 34 ++++++++++++++++------ 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index ff0586b..c78ca5e 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -35,18 +35,21 @@ You'd love to read about your experiences during the training, product testing, * Scenario: describe the process of the test you ran. * Demographics: While we are not interested in specific characteristics of our audience, or binary attributes, we must know the total reach of your Tor training. You should take [this material]() with you on the day of your research, distribute it among participants, and answer their questions about how to fill it in if they have any. -* Interview Process: Thank the participant for their willingness to participate in this process and explain that we are testing the product, not them. The interview should not last longer than 20 minutes, you can record if you wish, but you can also take notes on the printed material you will carry with you (or on your computer). Thank the participant again and end the interview. +* Interview Process: Thank the participant for their willingness to participate in this process and explain that we are testing the product, not them. +The interview should not last longer than 20 minutes, you can record if you wish, but you can also take notes on the printed material you will carry with you (or on your computer). +Thank the participant again and end the interview. Send us the result - you don't have to write a report, we can do this data analysis with the material you collected. - ## Coordinate with the trainer and the Tor UX team You're not doing all this work alone - we will support you with meetings, guides, and mentorship if you want. You can join us at any time on our IRC channel #tor-ux and our [mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux). -You must be aligned about the agenda and time to run interviews (if that is the case) during the end of the training. **We strongly recommend that you go through the program of the exercise with the trainer**. Also, we want you two to coordinate feedback together — both for you and for your audience. +You must be aligned about the agenda and time to run interviews (if that is the case) during the end of the training. **We strongly recommend that you go through the program of the exercise with the trainer**. +Also, we want you two to coordinate feedback together - both for you and for your audience. At the beginning of the training, be sure to let everyone know what is your role there and why you're taking notes on the practice. ## Get prepared! + Print and bring with you the material that you will need to run the research - that will probably be something like: * Demographics @@ -58,12 +61,18 @@ It is easier to have this material printed and in hand, but if you prefer, you c Keep in mind that you might not have Internet access at the venue, so if you're going to install a Tor feature with someone during the interview, you may need to have it downloaded before the training. ## Report to Tor UX team -Before ending the training, coordinate the feedback with the trainer. The two of you should work together to hand out post-its for the audience, you can give each participant post-it of a different color per question and ask them to fill it with what they think about: 1. the service they just learned; 2. Tor project; and 3. Tor in general. It can also be questions - keep in mind that any feedback is a good feedback. -It is very important for us to hear back from you. We want to know how the training and the research was for you, how we can improve our support and also, if you want to keep running Tor User Research. We will ask you to fill a form at the end of the research, so we can get your address to send to you a researcher kit (t-shirt and stickers). +Before ending the training, coordinate the feedback with the trainer. +The two of you should work together to hand out post-its for the audience, you can give each participant post-it of a different color per question and ask them to fill it with what they think about: 1. the service they just learned; 2. Tor project; and 3. Tor in general. +It can also be questions - keep in mind that any feedback is a good feedback. + +It is very important for us to hear back from you. +We want to know how the training and the research was for you, how we can improve our support and also, if you want to keep running Tor User Research. +We will ask you to fill a form at the end of the research, so we can get your address to send to you a researcher kit (t-shirt and stickers). We hope to hear back from you very soon! -Before your session, read and print this material on [User Research Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/comm…. If you don't think you'll have time to report in this format, we will happily accept your findings another way – for example, you can take pictures or send your 'raw' notes to us. +Before your session, read and print this material on [User Research Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/comm…. +If you don't think you'll have time to report in this format, we will happily accept your findings another way - for example, you can take pictures or send your 'raw' notes to us. ### How to submit your findings diff --git a/content/user-research/how-to-volunteer/contents.lr b/content/user-research/how-to-volunteer/contents.lr index a3f3f3f..b3a5c81 100644 --- a/content/user-research/how-to-volunteer/contents.lr +++ b/content/user-research/how-to-volunteer/contents.lr @@ -8,27 +8,43 @@ body: If this is your first time running a User Research session for the Tor Project, we recommend starting with one of these studies. Both can be conducted on a rolling basis and ran remotely. - - [Usability Testing Tor Browser Desktop](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… - [Discovery Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… -After choosing which study to run, open an issue in our [GitLab page](https://gitlab.torproject.org/tpo/ux/research). Add the title of your research, then select the Usability Testing template option and fill it in. Please remember to update the issue as your research evolves. +After choosing which study to run, open an issue in our [GitLab page](https://gitlab.torproject.org/tpo/ux/research). +Add the title of your research, then select the Usability Testing template option and fill it in. +Please remember to update the issue as your research evolves. -Not all of the data collected in our research is disclosed to the public, but our general findings are. To protect our participants' privacy we take care to anonymize their responses and avoid recording our sessions. +Not all of the data collected in our research is disclosed to the public, but our general findings are. +To protect our participants' privacy we take care to anonymize their responses and avoid recording our sessions. -If you're already familiar with the Tor Project and user testing, have a look at our [current needs for user research](https://community.torproject.org/user-research/open/) and see which study better suits you. Remember to drop us an email telling us about your plans so we can follow and support your research. +If you're already familiar with the Tor Project and user testing, have a look at our [current needs for user research](https://community.torproject.org/user-research/open/) and see which study better suits you. +Remember to drop us an email telling us about your plans so we can follow and support your research. As a volunteer we also ask that you read and follow our [Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_…, as well our [Guidelines for Research](https://community.torproject.org/user-research/guidelines/). -**Why do we run Demographics?** We don't collect personal data in our [Demographics](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/s…, and all questions are optional. We believe it's important to collect basic demographics to help us understand if we are meeting our mission regarding diversity and inclusion. In addition, collecting these demographics is required for specific studies to support human rights. +**Why do we run Demographics?** +We don't collect personal data in our [Demographics](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/s…, and all questions are optional. +We believe it's important to collect basic demographics to help us understand if we are meeting our mission regarding diversity and inclusion. +In addition, collecting these demographics is required for specific studies to support human rights. -**We don't trick participants.** We don't use trick questions in our research. We expect participants to be honest with us, and we must be honest about our questions in return. As a transparent research space our surveys, studies, and reports are all public, and participants are free to view past studies prior to taking part – however they are not advised to do so. +**We don't trick participants.** We don't use trick questions in our research. +We expect participants to be honest with us, and we must be honest about our questions in return. +As a transparent research space our surveys, studies, and reports are all public, and participants are free to view past studies prior to taking part - however they are not advised to do so. -**We don't track participants.** We care about your privacy and security. If we invite you to participate in a study, we won't track you and any recordings will be erased after the report is complete. We advise volunteers not to record their sessions at all. +**We don't track participants.** We care about your privacy and security. +If we invite you to participate in a study, we won't track you and any recordings will be erased after the report is complete. +We advise volunteers not to record their sessions at all. -**Open source for privacy.** We use free and open source software to analyze our data, and we recommend our volunteers do the same. We also ask anyone running research not use software hosted by third parties like cloud providers. +**Open source for privacy.** +We use free and open source software to analyze our data, and we recommend our volunteers do the same. +We also ask anyone running research not use software hosted by third parties like cloud providers. -**Decision-making process.** We don't have a single model for decision making. After conducting your research, it's normal to be excited to see your feedback implemented as soon as possible. However all feedback must be discussed internally across the different teams at the Tor Project first. This means that it's often necessary to run the same research more than once to validate your findings, and meet the expectations of the engineers, developers, designers, researchers and others at Tor. Please read our [Guidelines](https://community.torproject.org/user-research/guidelines/) to get to know this process more. +**Decision-making process.** We don't have a single model for decision making. +After conducting your research, it's normal to be excited to see your feedback implemented as soon as possible. +However all feedback must be discussed internally across the different teams at the Tor Project first. +This means that it's often necessary to run the same research more than once to validate your findings, and meet the expectations of the engineers, developers, designers, researchers and others at Tor. +Please read our [Guidelines](https://community.torproject.org/user-research/guidelines/) to get to know this process more. ## Checklist

1 0

[community/staging] Merge branch 'master' of git-rw.torproject.org:project/web/community into staging
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 4b278adda3238ecabc817c10bedeaca06a8086d3 Merge: 46c6d92 9831657 Author: gus <gus(a)torproject.org> Date: Thu Apr 15 15:32:25 2021 -0300 Merge branch 'master' of git-rw.torproject.org:project/web/community into staging .htaccess | 2 +- community.lektorproject | 8 +- configs/i18n.ini | 2 +- .../community-resources/good-bad-isps/contents.lr | 5 +- .../bridge/centos-rhel-opensuse/contents.lr | 4 +- .../bridge/debian-ubuntu/contents.lr | 2 +- .../technical-setup/bridge/docker/contents.lr | 14 +++- .../bridge/dragonflybsd/contents.lr | 2 +- .../technical-setup/bridge/fedora/contents.lr | 2 +- .../technical-setup/bridge/freebsd/contents.lr | 2 +- .../technical-setup/bridge/netbsd/contents.lr | 2 +- .../technical-setup/bridge/openbsd/contents.lr | 2 +- .../bridge/post-install/contents.lr | 2 +- .../technical-setup/guard/fedora/contents.lr | 25 +++--- .../technical-setup/guard/windows/contents.lr | 93 ++++++++++++++++++++++ content/user-research/guidelines/contents.lr | 30 +++++-- content/user-research/how-to-volunteer/contents.lr | 70 ++++++++++++++++ content/user-research/open/contents.lr | 20 +---- content/user-research/persona/contents.lr | 11 +-- content/user-research/reports/contents.lr | 36 +++++++++ databags/alternatives.ini | 6 +- models/page.ini | 1 + models/text.ini | 2 + templates/home.html | 8 +- templates/homepage.html | 9 ++- templates/layout.html | 3 +- templates/onion-services.html | 2 +- templates/outreach-talk.html | 2 +- templates/pagenav.html | 2 +- templates/relay-operations.html | 2 +- templates/two-columns-page.html | 2 +- 31 files changed, 294 insertions(+), 79 deletions(-)

1 0