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

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 5a509fbdf32c31e0e824b63b9f97c4bf48a5124d Merge: e748c1d1e7 8a0f530adf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.4.2] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:32 2020 -0400 Add a pair of warnings about only editing CI in 035 --- .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc160ffaea..5a46c1a0e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,8 @@ +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This file controls how gitlab validates Tor commits and merge requests. # # It is primarily based on a set of scripts and configurations by diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 50728a137e..bede68baa8 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -1,5 +1,10 @@ #!/bin/bash +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This script is used to build Tor for continuous integration. It should # be kept the same for all supported Tor versions. #

1 0

[tor/release-0.3.5] Add a pair of warnings about only editing CI in 035
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit 8a0f530adffc4dbdb1afa065b214dd282f8bca8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:32 2020 -0400 Add a pair of warnings about only editing CI in 035 --- .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc160ffaea..5a46c1a0e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,8 @@ +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This file controls how gitlab validates Tor commits and merge requests. # # It is primarily based on a set of scripts and configurations by diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 50728a137e..bede68baa8 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -1,5 +1,10 @@ #!/bin/bash +#### +# DO NOT EDIT THIS FILE IN MASTER. ONLY EDIT IT IN THE OLDEST SUPPORTED +# BRANCH, THEN MERGE FORWARD. +#### + # This script is used to build Tor for continuous integration. It should # be kept the same for all supported Tor versions. #

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b Merge: 68f8250cbb 8a0f530adf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 11 Aug '20

11 Aug '20

commit f06e08e4d69132279c1151aeecb5fc8fa0b70205 Merge: 28bbe09b80 e4a6d9d5a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 .gitlab-ci.yml | 5 +++++ scripts/ci/ci-driver.sh | 5 +++++ 2 files changed, 10 insertions(+)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 11 Aug '20

11 Aug '20

commit eae5ffe5799dfd82f56d90e8bde7e33af34457e2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 11 14:18:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 0e986408ad..8e4bf2fa6b 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,10 +2,10 @@ # Translators: # 0d1bdb3b9a0d4e8f77bc854af8bf3dfc_e6913f4, 2019 # dersteppenwolfx, 2019 -# T. E. Kalayci <tekrei(a)gmail.com>, 2020 # erinm, 2020 # Emma Peel, 2020 # Kaya Zeren <kayazeren(a)gmail.com>, 2020 +# T. E. Kalayci <tekrei(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>, 2020\n" +"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>, 2020\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -791,7 +791,7 @@ msgstr "" #: https//support.torproject.org/glossary/hamburger-menu/ #: (content/glossary/hamburger-menu/contents+en.lrword.term) msgid "hamburger menu" -msgstr "" +msgstr "hamburger menü" #: https//support.torproject.org/glossary/hamburger-menu/ #: (content/glossary/hamburger-menu/contents+en.lrword.definition) @@ -810,7 +810,7 @@ msgstr "" #: https//support.torproject.org/glossary/hamburger-menu/ #: (content/glossary/hamburger-menu/contents+en.lrword.definition) msgid "Reference: https://en.wikipedia.org/wiki/Hamburger_button" -msgstr "" +msgstr "Kaynak: https://en.wikipedia.org/wiki/Hamburger_button" #: https//support.torproject.org/glossary/hamburger-menu/ #: (content/glossary/hamburger-menu/contents+en.lrword.definition) @@ -2292,7 +2292,7 @@ msgstr "" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "File sharing:" -msgstr "" +msgstr "Dosya paylaşımı:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[sbws/master] fix: doc: Replace Trac, ticket by Gitlab, issue
by juga＠torproject.org 11 Aug '20

11 Aug '20

commit c7b1c01e51afbc6722925f140ad87c260ac4b8b8 Author: juga0 <juga(a)riseup.net> Date: Fri Jun 26 07:17:06 2020 +0000 fix: doc: Replace Trac, ticket by Gitlab, issue Closes: #40001 --- docs/source/contributing.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 66cf9d2..161f971 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -18,7 +18,7 @@ Bug reports or feature requests .. _ticket-ref: * Open a issue in - `Tor Project Trac <https://gitlab.torproject.org/tpo/network-health/sbws/-/issues>`_ . + `Tor Project Gitlab <https://gitlab.torproject.org/tpo/network-health/sbws/-/issues>`_ . Code/documentation patches --------------------------- @@ -42,7 +42,7 @@ The following are guidelines we aim to follow. Steps to create a PR ~~~~~~~~~~~~~~~~~~~~~ -1. Create a ticket in Tor Project Trac (:ref:`Open ticket <ticket-ref>`) +1. Create a issue in Tor Project Gitlab (:ref:`Open issue <ticket-ref>`) 2. Clone ``sbws`` via the Github web interface https://github.com/torproject/sbws 3. Clone the repository locally @@ -132,7 +132,7 @@ but not all. Commits ~~~~~~~~~ -Each commit should reference the Tor Project Trac ticket (example: ``#12345``) +Each commit should reference the Tor Project Gitlab issue (example: ``#12345``) and possibly the bugfix version. Try to make each commit a logically separate changes.:: @@ -254,7 +254,7 @@ Before major releases, ensure that: .. _changelog: Create a ./CHANGELOG.rst file. -Each entry should reference the Tor Project Trac ticket (example: ``#12345``) +Each entry should reference the Tor Project Gitlab issue (example: ``#12345``) and possibly the bugfix version. Until version 1.0.2 we have followed `keep a changelog`_ format.

1 0

[sbws/master] fix: Replace links from Trac to Gitlab
by juga＠torproject.org 11 Aug '20

11 Aug '20

commit ba4791d1ca255b9e91d5b0a8e11471714f78d08a Author: juga0 <juga(a)riseup.net> Date: Fri Jun 26 07:07:35 2020 +0000 fix: Replace links from Trac to Gitlab --- docs/source/contributing.rst | 5 ++--- docs/source/man_sbws.ini.rst | 2 +- docs/source/man_sbws.rst | 2 +- docs/source/tor_bandwidth_files.rst | 4 ++-- sbws/core/scanner.py | 4 +++- sbws/lib/v3bwfile.py | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 15da287..66cf9d2 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -17,9 +17,8 @@ Bug reports or feature requests .. _ticket-ref: -* Open a ticket in - `Tor Project Trac <https://trac.torproject.org>`_ - and assign the component to ``Core Tor``/``sbws``. +* Open a issue in + `Tor Project Trac <https://gitlab.torproject.org/tpo/network-health/sbws/-/issues>`_ . Code/documentation patches --------------------------- diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 5f4241b..22512b8 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -226,4 +226,4 @@ SEE ALSO BUGS ---- -Please report bugs at https://trac.torproject.org/. \ No newline at end of file +Please report bugs at https://gitlab.torproject.org/tpo/network-health/sbws/-/issues/. diff --git a/docs/source/man_sbws.rst b/docs/source/man_sbws.rst index c9411e4..608c36d 100644 --- a/docs/source/man_sbws.rst +++ b/docs/source/man_sbws.rst @@ -114,4 +114,4 @@ https://gitweb.torproject.org/torspec.git/tree/bandwidth-file-spec.txt, BUGS ---- -Please report bugs at https://trac.torproject.org/. \ No newline at end of file +Please report bugs at https://gitlab.torproject.org/tpo/network-health/sbws/-/issues/. diff --git a/docs/source/tor_bandwidth_files.rst b/docs/source/tor_bandwidth_files.rst index 94aaae7..94fae97 100644 --- a/docs/source/tor_bandwidth_files.rst +++ b/docs/source/tor_bandwidth_files.rst @@ -18,7 +18,7 @@ To appear in Tor v0.4.1.x: bandwidth-file-digest sha256=01234567890123456789abcdefghijkl -https://trac.torproject.org/projects/tor/ticket/26698 +https://gitlab.torproject.org/tpo/core/tor/-/issues/26698 Directory authorities' bandwidth file URL ----------------------------------------- @@ -29,4 +29,4 @@ To appear in Tor v0.4.1.x: /tor/status-vote/next/bandwidth.z -https://trac.torproject.org/projects/tor/ticket/21377 +https://gitlab.torproject.org/tpo/core/tor/-/issues/21377 diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 3210c80..e5d5e90 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -43,7 +43,9 @@ rd = None controller = None FILLUP_TICKET_MSG = """Something went wrong. -Please create a ticket in https://trac.torproject.org with this traceback.""" +Please create an issue at +https://gitlab.torproject.org/tpo/network-health/sbws/-/issues with this +traceback.""" def stop_threads(signal, frame, exit_code=0): diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 0c1f9b6..343a490 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -1250,7 +1250,7 @@ class V3BWFile(object): # Generators SHOULD NOT limit measured bandwidths based on # descriptors' bandwidth-observed, because that penalises new # relays. - # See https://trac.torproject.org/projects/tor/ticket/8494 + # See https://gitlab.torproject.org/tpo/core/tor/-/issues/8494 # If the observed bandwidth is None, it is not possible to # calculate the minimum with the other descriptors. # Only in this case, take the consensus bandwidth.

1 0

[sbws/master] fix: doc: Replace Github review process to Gitlab
by juga＠torproject.org 11 Aug '20

11 Aug '20

commit f26e4bc58d80717f2d8893a9f72003cfc84da014 Author: juga0 <juga(a)riseup.net> Date: Fri Jun 26 07:42:33 2020 +0000 fix: doc: Replace Github review process to Gitlab Replace also Github terminology to Gitlab. --- docs/source/contributing.rst | 57 +++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 161f971..658cf80 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -24,8 +24,9 @@ Code/documentation patches --------------------------- The sbws canonical repository is https://gitweb.torproject.org/sbws.git, -but we review patches using the Github canonical repository -(https://github.com/torproject/sbws) Pull Requests (PR). +but we review patches using the Gitlab repository +(https://gitlab.torproject.org/tpo/network-health/sbws/-/merge_requests) +Merge Requests (MR). To know more about ``sbws`` code, @@ -39,12 +40,12 @@ To know more about ``sbws`` code, The following are guidelines we aim to follow. -Steps to create a PR +Steps to create a MR ~~~~~~~~~~~~~~~~~~~~~ 1. Create a issue in Tor Project Gitlab (:ref:`Open issue <ticket-ref>`) -2. Clone ``sbws`` via the Github web interface - https://github.com/torproject/sbws +2. Fork ``sbws`` via the Gitlab web interface: + https://gitlab.torproject.org/tpo/network-health/sbws 3. Clone the repository locally 4. Install ``sbws`` as explained in ./INSTALL.rst and ./TESTING.rst Use ``pip install -e <>`` @@ -56,11 +57,23 @@ Steps to create a PR 7. Write code (:ref:`codestyle-ref`), tests, documentation, extra files (:ref:`extrafiles-ref`), commit (:ref:`commits-ref`), etc. 8. Ensure tests pass (./TESTING.rst). -9. Push your branch to your repository. If you have an account in Travis, - you can see whether it pass the tests in Github and in - https://travis-ci.org/youruser/sbws/ -10. Create a PR from your branch to https://github.com/torproject/sbws -11. Change the Trac ticket status to ``needs_review`` +9. Push your branch to your Gitlab repository. + +We are temporally using Github Travis to ensure tests pass. For this: + +10. Clone ``sbws`` via the Github web interface: + https://github.com/torproject/sbws +11. Push your branch to your Github repository. + +12. If you have an account in Travis, you can see whether it pass the tests in + Github and at https://travis-ci.org/youruser/sbws/ + +Finally: + +13. Create a MR from your branch at + https://gitlab.torproject.org/tpo/network-health/sbws + + .. _codestyle-ref: @@ -154,27 +167,27 @@ Template originally written by `Tim Pope`_: :ref:`example commit <commit-msg>` Code being reviewed workflow ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -When a PR is being reviewed, new changes might be needed: +When a MR is being reviewed, new changes might be needed: - If the change does not modify a previous change, create new commits and push. - If the change modifies a previous change and it's small, `git commit fixup <https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---fixupltc…>`_ - should be used. When it is agreed that the PR is ready, create a new branch + should be used. When it is agreed that the MR is ready, create a new branch named ``mybranch_02`` and run: .. code-block:: bash rebase --autosquash - push, create new PR and close old PR mentioning the number of the new PR. -- If the review takes long and when it's ready code related to the PR has changed + push, create new MR and close old MR mentioning the number of the new MR. +- If the review takes long and when it's ready code related to the MR has changed in master, create a new branch named ``mybranch_02`` and run: .. code-block:: bash rebase master - push, create new PR and close old PR mentioning the number of the new PR. + push, create new MR and close old MR mentioning the number of the new MR. [MERG]_ @@ -196,23 +209,23 @@ Reviewers: - Should let the contributor know what to improve/change. - Should not push code to the contributor's branch. - Should wait for contributor's changes or feedback after changes are requested, - before merging or closing a PR. -- Should merge (not rebase) the PR. + before merging or closing a MR. +- Should merge (not rebase) the MR. - If rebase is needed due to changes in master, the contributor should create a new branch named `xxx_rebased` based on the reviewed branch, rebase and - create a new PR from it, as explained above. + create a new MR from it, as explained above. - If new changes are needed when the contributor's branch is ready to merge, the reviewer can create a new branch based on the contributor's branch, - push the changes and merge that PR. + push the changes and merge that MR. The contributor should be notified about it. -- If the reviewer realize that new changes are needed after the PR has been +- If the reviewer realize that new changes are needed after the MR has been merged, the reviewer can push to master, notifying the contributor about the changes. - Because currently there are not many reviewers, reviewers can merge their own - PR if there was not any feedback after a week. + MR if there was not any feedback after a week. - Should not push directly to master, unless changes are trivial (typos, extra spaces, etc.) -- Should not push to master new features while there are open PRs to review. +- Should not push to master new features while there are open MRs to review. Currently, the reviewers are the persons that have contributed to the code: pastly, teor, juga.

1 0

[sbws/master] fix: doc: Update reviewers
by juga＠torproject.org 11 Aug '20

11 Aug '20

commit ef4e8bb3ef12f850c63e99ca6c686287596adb0d Author: juga0 <juga(a)riseup.net> Date: Fri Jun 26 07:57:29 2020 +0000 fix: doc: Update reviewers --- docs/source/contributing.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 658cf80..b5259c8 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -227,8 +227,9 @@ Reviewers: extra spaces, etc.) - Should not push to master new features while there are open MRs to review. -Currently, the reviewers are the persons that have contributed to the code: -pastly, teor, juga. +Currently, the reviewers are `gk <https://gitlab.torproject.org/gk>`_, +`ahf <https://gitlab.torproject.org/ahf>`_, +`juga <https://gitlab.torproject.org/juga>`_. .. _releases-ref:

1 0