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

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 12 Jul '18

12 Jul '18

commit 172708a1639a907950148e54e95fd87b933f9627 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 12 08:19:29 2018 +0000 Update translations for support-tbb --- pl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl.json b/pl.json index 299cb8e8f..a9818474f 100644 --- a/pl.json +++ b/pl.json @@ -254,7 +254,7 @@ "tbb-42": { "id": "#tbb-42", "control": "tbb-42", - "title": "Why does my Tor Browser say something about Firefox not working?", - "description": "Tor Browser is built using <a href=\"https://www.mozilla.org/en-US/firefox/organizations/\">Firefox ESR</a>, so errors regarding Firefox may occur. Please be sure no other instance of Tor Browser is already running, and that you have extracted Tor Browser in a location that your user has the correct permissions for. If you are running an anti-virus, please see [linkto: My antivirus/malware protection is blocking me from accessing Tor Browser], it is common for anti-virus / anti-malware software to cause this type of issue." + "title": "Dlaczego Przeglądarka Tor wyświetla komunikat o tym, że nie działa Firefox?", + "description": "Przeglądarka Tor jest stworzona w oparci u o <a href=\"https://www.mozilla.org/en-US/firefox/organizations/\">Firefox ESR</a>, więc mogą wystąpić błędy związane z tą platformą. Upewnij się, że Przeglądarka Tor nie jest otwarta gdzieś indziej oraz zainstaluj ją w taki sposób, że twoje konto użytkownika będzie miało dostateczne uprawnienia do uruchomienia jej. Tego rodzaju błąd jest również typowy, jeśli korzystasz z programu anty-wirusowego [linkto: My antivirus/malware protection is blocking me from accessing Tor Browser]." } }

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 12 Jul '18

12 Jul '18

commit 6f620188004ed229a0e3ca81d6065d36b08bcf70 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 12 07:49:30 2018 +0000 Update translations for support-tbb --- pl.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pl.json b/pl.json index 2702d132b..299cb8e8f 100644 --- a/pl.json +++ b/pl.json @@ -21,19 +21,19 @@ "id": "#tbb-4", "control": "tbb-4", "title": "Why is Tor Browser built from Firefox and not some other browser", - "description": "Tor Browser is a modified version of Firefox specifically designed for use with Tor. A lot of work has been put into making the Tor Browser, including the use of extra patches to enhance privacy and security. While it is technically possible to use Tor with other browsers, you may open yourself up to potential attacks or information leakage, so we strongly discourage it. <a href=\"https://www.torproject.org/projects/torbrowser/design/\">Learn more about the design of Tor Browser</a>." + "description": "Przeglądarka Tor jest zmienioną wersją Firefox'a, dostosowaną do działania w sieci Tor. Włożyliśmy dużo pracy, aby stworzyć Przeglądarkę Tor, m.in. programując rozszerzenia podnoszące poziom bezpieczeństwa i anonimowości. Istnieje techniczna możliwość korzystania z Tor za pośrednictwem innych przeglądarek, ale naraża to użytkownika na potencjalne ataki lub wyciek danych, więc nie polecamy takiego rozwiązania. <a href=\"https://www.torproject.org/projects/torbrowser/design/\">Dowiedz się więcej o działaniu Przeglądarki Tor</a>. " }, "tbb-5": { "id": "#tbb-5", "control": "tbb-5", - "title": "Can I still use another browser, like Chrome or Firefox, when I am using Tor Browser", - "description": "You can certainly use another browser while you are also using Tor Browser. However, you should know that the privacy properties of Tor Browser will not be present in the other browser. Be careful when switching back and forth between Tor and a less safe browser, because you may accidentally use the other browser for something you intended to do using Tor." + "title": "Czy mogę używać innych przeglądarek, tj. Chrome lub Firefox, podczas korzystania z Przeglądarki Tor?", + "description": "Możesz korzystać z innej przeglądarki równocześnie używając Przeglądarki Tor. Musisz jednak wiedzieć, że ochrona anonimowości zapewniona przez Przeglądarkę Tor nie obejmuje innej przeglądarki. Zachowaj ostrożność podczas przełączania się między Tor i mniej bezpieczną przeglądarką, ponieważ możesz jej przypadkiem użyć do czegoś, co miało zostać zrobione przy użyciu Tor." }, "tbb-6": { "id": "#tbb-6", "control": "tbb-6", "title": "Czy mogę ustawić Przeglądarkę Tor jako domyślną?", - "description": "Unfortunately, there is no supported way to make Tor Browser your default browser." + "description": "Nietety, nie jest to możliwe." }, "tbb-7": { "id": "#tbb-7",

1 0

[stem/master] 'async' SyntaxError with python 3.6 and above
by atagar＠torproject.org 11 Jul '18

11 Jul '18

commit 6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 11 09:05:32 2018 -0700 'async' SyntaxError with python 3.6 and above Python 3.6 adds a couple new keywords to the language (async and await) so we need to be careful not to use those. 99.9% of our users don't import our test utils so this was mostly moot, but Juan ran into an issue packaging Stem for Fedora... BUILDSTDERR: File "/usr/lib/python3.7/site-packages/stem/util/test_tools.py", line 151 BUILDSTDERR: self.method.async = self BUILDSTDERR: ^ BUILDSTDERR: SyntaxError: invalid syntax https://trac.torproject.org/projects/tor/ticket/26739 This line aimed to provide a way for tests to reference its AsyncTest instance. This doesn't look to actually be used in practice so think we can simply drop it. Checked with grep and a 'run_tests.py --all --target ONLINE' run. --- docs/change_log.rst | 1 + stem/util/test_tools.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index eeaf0362..88558374 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -80,6 +80,7 @@ The following are only available within Stem's `git repository * **Utilities** * Fixed PyPy compatibility (:trac:`26207`) + * Python 3.6+ syntax error if test_tools.py imported (:trac:`26739`) * Connection information from proc limited to 10,000 results * Accouting for attribute types in most equality checks and hashes diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 722398d0..c7573202 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -148,7 +148,6 @@ class AsyncTest(object): self._threaded = threaded self.method = lambda test: self.result(test) # method that can be mixed into TestCases - self.method.async = self self._process = None self._process_pipe = None

1 0

[sbws/master] Bump to 0.6.1-dev
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit c3ce3bb537b303102eed4c923a92c659eaa8a37e Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Wed Jul 11 10:57:49 2018 -0400 Bump to 0.6.1-dev --- sbws/__init__.py | 2 +- tests/unit/lib/data/v3bw/20180425_131057.v3bw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/__init__.py b/sbws/__init__.py index ef7eb44..270c7bf 100644 --- a/sbws/__init__.py +++ b/sbws/__init__.py @@ -1 +1 @@ -__version__ = '0.6.0' +__version__ = '0.6.1-dev' diff --git a/tests/unit/lib/data/v3bw/20180425_131057.v3bw b/tests/unit/lib/data/v3bw/20180425_131057.v3bw index 602943b..365be98 100644 --- a/tests/unit/lib/data/v3bw/20180425_131057.v3bw +++ b/tests/unit/lib/data/v3bw/20180425_131057.v3bw @@ -5,6 +5,6 @@ file_created=2018-04-25T13:10:57 generator_started=2018-04-16T14:09:05 latest_bandwidth=2018-04-17T14:09:07 software=sbws -software_version=0.6.0 +software_version=0.6.1-dev ==== bw=54 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s nick=A node_id=$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA rtt=456 success=1 time=2018-04-17T14:09:07

1 0

[sbws/master] Move test coverage paragraph
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 10bfaac548e5be30ba1bea7ca5b6cef13e23e9bb Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jun 25 15:13:19 2018 -0400 Move test coverage paragraph --- CONTRIBUTING.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index d286e98..bdbdd99 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -26,6 +26,9 @@ Pull requests are welcome, especially if they address open issues. We use flake8 to check some PEP8 errors/warnings. This will be checked with ``tox`` and Travis. +Simple Bandwidth Scanner is moving towards 100% test coverage. Please help us +reach that goal, or at least not move us away from it. + **Write good commit messages** that at least follow the spirit of :ref:`this example <commit-msg>`. @@ -33,8 +36,6 @@ We use flake8 to check some PEP8 errors/warnings. This will be checked with large mega-commit. This not only makes code review easier, but it also makes commits that show up in ``git blame`` 10 years from now make more sense. -Simple Bandwidth Scanner is moving towards 100% test coverage. Please help us -reach that goal, or at least not move us away from it. Coding Guidelines =================

1 0

[sbws/master] Allow datetime objects
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 32e37a12f0255ee5fd5028f5e0a9181f597d35d3 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jun 25 15:13:35 2018 -0400 Allow datetime objects --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index bdbdd99..b72d118 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -40,7 +40,7 @@ commits that show up in ``git blame`` 10 years from now make more sense. Coding Guidelines ================= -**Strongly prefer Unix timestamps** over ``datetime`` structures and always +**Strongly prefer Unix timestamps or datetime objects in UTC** and always work in UTC for as long as possible. When reading/writing/manipulating results from some period of time in the past, always err on the side of caution. For example, open an extra file into the past just in case it happens to include

1 0

[sbws/master] Reword sentences about flake8
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 7586585de8e065da70d7b4a064a4398173ccf0c4 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jun 25 15:12:52 2018 -0400 Reword sentences about flake8 --- CONTRIBUTING.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 31d0324..d286e98 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -23,8 +23,8 @@ Pull requests are welcome, especially if they address open issues. #. Commit your changes and push them to a branch in your sbws GitHub repo #. Open a `pull request`_ -We use flake8 to enforce standard python coding style. This will be checked -with ``tox``. +We use flake8 to check some PEP8 errors/warnings. This will be checked with +``tox`` and Travis. **Write good commit messages** that at least follow the spirit of :ref:`this example <commit-msg>`.

1 0

[sbws/master] Update scale-v3bw-with-budget.py to handle new v3bw format
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit d00fae040fb252ecb22de3516e2280bf0b554c5e Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Jun 26 12:31:59 2018 -0400 Update scale-v3bw-with-budget.py to handle new v3bw format --- scripts/tools/scale-v3bw-with-budget.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/tools/scale-v3bw-with-budget.py b/scripts/tools/scale-v3bw-with-budget.py index 3229e1e..62b17b4 100755 --- a/scripts/tools/scale-v3bw-with-budget.py +++ b/scripts/tools/scale-v3bw-with-budget.py @@ -24,18 +24,10 @@ def line_into_dict(line): def main(args): total_input_weight = 0 line_dicts = [] - is_first_line = True for line in args.input: - if is_first_line: - # First line is special and is supposed to be a timestamp - try: - int(line) - except ValueError as e: - fail_hard('First line should be an int.', e) - is_first_line = False + if 'node_id=' not in line: args.output.write(line) continue - # All lines but the first go through this d = line_into_dict(line) # Check that the required parts of the line are here if 'node_id' not in d:

1 0

[sbws/master] Add git/github guidelines
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 1b7453a6918ea63d5aad9fffd9f5e8c5163e2f87 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Jun 25 15:14:03 2018 -0400 Add git/github guidelines --- CONTRIBUTING.rst | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index b72d118..8336add 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -29,13 +29,28 @@ We use flake8 to check some PEP8 errors/warnings. This will be checked with Simple Bandwidth Scanner is moving towards 100% test coverage. Please help us reach that goal, or at least not move us away from it. +Git and GitHub Guidelines +========================= + **Write good commit messages** that at least follow the spirit of :ref:`this example <commit-msg>`. -**Write many small commits** each containing an atomic change instead of one -large mega-commit. This not only makes code review easier, but it also makes -commits that show up in ``git blame`` 10 years from now make more sense. +Strive to **write many small commits** each containing an atomic change instead +of one large mega-commit. This not only makes code review easier, but it also +makes commits that show up in ``git blame`` 10 years from now make more sense. + +**Prefer a rebase workflow instead of merge**. Incorporating PRs should be done +with fast-forward merge, if easily possible. The larger the topic branch, the +harder this may be, so merge commits are allowed. + +If, while working on a topic branch, some changes are made to master that +conflict with your work or that you need to incorporate into your work, **do +not merge master into your topic branch**; instead, rebase your topic branch on +top of master or cherry-pick the changes. +**Do not force push lightly** unless branches are clearly labeled as ones that +may get overwritten (for example: "transient\_" prefix). Instead of overwriting +a branch, add a version suffix (for example: "_02"). Coding Guidelines =================

1 0

[sbws/master] Require python version from 3.4.5
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit c21c6e9e9ba8b36280cb5469e8c1c87aa25864c0 Author: juga0 <juga(a)riseup.net> Date: Sun Jul 1 10:35:47 2018 +0000 Require python version from 3.4.5 Since version 3.4.2 gives error on install_layout and it is not the default in stable OS distributions --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 206526c..b7be0f7 100755 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ setup( }, data_files=get_data_files(), keywords='', - python_requires='>=3.4', + python_requires='>=3.4.5', # test_suite='test', entry_points={ 'console_scripts': [

1 0