December 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 793c4a3c922765f92b7eabc4aa179043e61105a8 Merge: 39344e410 b9504f788 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:04:22 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[snowflake/master] Document setting the proxyType for metrics
by arlo＠torproject.org 09 Dec '19

09 Dec '19

commit 1e45d48a3c4ef05434916d963f0c00d8c0246ac9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Dec 6 17:54:54 2019 -0500 Document setting the proxyType for metrics Trac: 32499 --- proxy/README.md | 8 +++++++- proxy/config.js | 6 +++++- proxy/init-badge.js | 3 +-- proxy/init-node.js | 2 +- proxy/init-testing.js | 2 +- proxy/init-webext.js | 3 +-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index fedfa20..33b8738 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -122,7 +122,7 @@ var log = function(msg) { }; var dbg = log; -var config = new Config(); +var config = new Config("myui"); // NOTE: Set a unique proxy type for metrics var ui = new MyUI(); // NOTE: Using the class defined above var broker = new Broker(config.brokerUrl); @@ -134,4 +134,10 @@ snowflake.beginWebRTC(); This minimal setup is pretty much what's currently in `init-node.js`. +When configuring the snowflake, set a unique `proxyType` (first argument +to `Config`) that will be used when recording metrics at the broker. Also, +it would be helpful to get in touch with the [Anti-Censorship Team][2] at the +Tor Project to let them know about your tool. + [1]: https://chrome.google.com/webstore/detail/cupcake/dajjbehmbnbppjkcnpdkaniap… +[2]: https://trac.torproject.org/projects/tor/wiki/org/teams/AntiCensorshipTeam diff --git a/proxy/config.js b/proxy/config.js index 2b698a6..39c2b15 100644 --- a/proxy/config.js +++ b/proxy/config.js @@ -1,5 +1,9 @@ -class Config {} +class Config { + constructor(proxyType) { + this.proxyType = proxyType || ''; + } +} Config.prototype.brokerUrl = 'snowflake-broker.freehaven.net'; diff --git a/proxy/init-badge.js b/proxy/init-badge.js index 2e0a261..cb066e8 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -169,8 +169,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific return; } - config = new Config; - config.proxyType = "badge"; + config = new Config("badge"); if ('off' !== query.get('ratelimit')) { config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes); } diff --git a/proxy/init-node.js b/proxy/init-node.js index 73c25dc..b5a60d8 100644 --- a/proxy/init-node.js +++ b/proxy/init-node.js @@ -4,7 +4,7 @@ Entry point. */ -var config = new Config; +var config = new Config("node"); var ui = new UI(); diff --git a/proxy/init-testing.js b/proxy/init-testing.js index f553f12..01b6147 100644 --- a/proxy/init-testing.js +++ b/proxy/init-testing.js @@ -79,7 +79,7 @@ var snowflake, query, debug, ui, silenceNotifications, log, dbg, init; init = function() { var broker, config, ui; - config = new Config; + config = new Config("testing"); if ('off' !== query['ratelimit']) { config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', config.rateLimitBytes); } diff --git a/proxy/init-webext.js b/proxy/init-webext.js index afa9aee..3eb42dd 100644 --- a/proxy/init-webext.js +++ b/proxy/init-webext.js @@ -171,8 +171,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific }; init = function() { - config = new Config; - config.proxyType = "webext"; + config = new Config("webext"); ui = new WebExtUI(); broker = new Broker(config); snowflake = new Snowflake(config, ui, broker);

1 0

[stem/master] Add a stem test to look for regressions in Tor ticket 31495.
by atagar＠torproject.org 09 Dec '19

09 Dec '19

commit ab44af05e4165f68da67870b434b705e8ffb4e86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 8 18:03:59 2019 -0400 Add a stem test to look for regressions in Tor ticket 31495. This closes Tor ticket 31909. --- test/integ/control/controller.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index ba4037d8..e7c979b2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -784,6 +784,23 @@ class TestController(unittest.TestCase): shutil.rmtree(tmpdir) @test.require.controller + def test_set_conf_31495_regression(self): + """ + Make sure that we can set UseBridges=1 and set a Bridge, to + check for a regression in Tor bug 31945. + """ + with test.runner.get_runner().get_tor_controller() as controller: + # Make sure we aren't a relay, so that we can set UseBridges. + controller.set_conf("ORPort", "0") + + # Try setting UseBridges, to make sure we don't reject the request. + controller.set_options([("UseBridges", "1"), + ("Bridge", "127.0.0.1:9999")]) + + # Set UseBridges back again to avoid problems in later tests. + controller.set_conf("UseBridges", "0") + + @test.require.controller def test_set_conf_when_immutable(self): """ Issue a SETCONF for tor options that cannot be changed while running.

1 0

[stem/master] Revert ORPort after new integ test
by atagar＠torproject.org 09 Dec '19

09 Dec '19

commit cb61dfe74a0a4b87b115ed834624cf2c9c5d282c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 9 11:44:08 2019 -0800 Revert ORPort after new integ test Nick's new test passes with flying colors, but does not revert the ORPort back to the value we previously had. This worked because this test coincidently was one of the last. Also fixing minor stylistic issues cited by pycodestyle... STATIC CHECKS * /home/atagar/Desktop/stem/test/integ/control/controller.py line 794 - use single rather than double quotes | controller.set_conf("ORPort", "0") line 797 - use single rather than double quotes | controller.set_options([("UseBridges", "1"), line 798 - use single rather than double quotes | ("Bridge", "127.0.0.1:9999")]) line 801 - use single rather than double quotes | controller.set_conf("UseBridges", "0") --- stem/control.py | 2 ++ test/integ/control/controller.py | 27 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/stem/control.py b/stem/control.py index f0242b0d..42736486 100644 --- a/stem/control.py +++ b/stem/control.py @@ -299,6 +299,8 @@ MALFORMED_EVENTS = 'MALFORMED_EVENTS' State = stem.util.enum.Enum('INIT', 'RESET', 'CLOSED') +# TODO: consider merging this with stem.response.event in stem 2.x? (#32689) + EventType = stem.util.enum.UppercaseEnum( 'ADDRMAP', 'AUTHDIR_NEWDESCS', diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index e7c979b2..6e45d0fa 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -773,6 +773,7 @@ class TestController(unittest.TestCase): self.assertEqual('17234 127.0.0.1:17235', controller.get_conf('HiddenServicePort')) finally: # reverts configuration changes + controller.set_options(( ('ExitPolicy', 'reject *:*'), ('ConnLimit', None), @@ -784,21 +785,27 @@ class TestController(unittest.TestCase): shutil.rmtree(tmpdir) @test.require.controller - def test_set_conf_31495_regression(self): + def test_set_conf_for_usebridges(self): """ - Make sure that we can set UseBridges=1 and set a Bridge, to - check for a regression in Tor bug 31945. + Ensure we can set UseBridges=1 and also set a Bridge. This is a tor + regression check (:trac:`31945`). """ + with test.runner.get_runner().get_tor_controller() as controller: - # Make sure we aren't a relay, so that we can set UseBridges. - controller.set_conf("ORPort", "0") + orport = controller.get_conf('ORPort') - # Try setting UseBridges, to make sure we don't reject the request. - controller.set_options([("UseBridges", "1"), - ("Bridge", "127.0.0.1:9999")]) + try: + controller.set_conf('ORPort', '0') # ensure we're not a relay so UseBridges is usabe + controller.set_options([('UseBridges', '1'), ('Bridge', '127.0.0.1:9999')]) + self.assertEqual('127.0.0.1:9999', controller.get_conf('Bridge')) + finally: + # reverts configuration changes - # Set UseBridges back again to avoid problems in later tests. - controller.set_conf("UseBridges", "0") + controller.set_options(( + ('ORPort', orport), + ('UseBridges', None), + ('Bridge', None), + ), reset = True) @test.require.controller def test_set_conf_when_immutable(self):

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 09 Dec '19

09 Dec '19

commit bbbaec733a3e47aa6bad4e9890d0ff55d7cc6e6a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 9 19:20:24 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+it.po b/contents+it.po index 7c2efe153b..9b58fed2a0 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1080,7 +1080,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "manipolare le identità" +msgstr "GESTIRE LE IDENTITÀ" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 09 Dec '19

09 Dec '19

commit 56df978c43732c99873faec9259e9a02ee45e691 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 9 18:49:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+it.po b/contents+it.po index 8f48bb1e60..7c2efe153b 100644 --- a/contents+it.po +++ b/contents+it.po @@ -566,8 +566,8 @@ msgid "" "This offers you the option to connect directly to the Tor network, or to " "configure Tor Browser for your connection." msgstr "" -"Questo ti offre la possibilità di connetterti direttamente alla rete Tor o " -"di configurare Tor Browser per la tua connessione." +"Questa finestra ti offre la possibilità di connetterti direttamente alla " +"rete Tor o di configurare Tor Browser per la tua connessione." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body)

1 0

[tpo/master] 0.4.2.5 is released.
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit b0c4ad0fdf4fa08665a9de0149d75613a439af69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 13:27:02 2019 -0500 0.4.2.5 is released. --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 0186dc1..446c05e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,8 +6,8 @@ win32 = 0.4.1.6 version = 9.5a3 [tor-stable] -version = 0.4.1.6 +version = 0.4.2.5 [tor-alpha] -version = 0.4.2.4-rc +version = 0.4.2.5

1 0

[dip/master] Modify gitaly configuration
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 8a76f298705dc841f2d77ed1e5ef15ee375e1d88 Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 19:13:22 2019 +0100 Modify gitaly configuration --- roles/gitaly/templates/gitaly.toml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index a06e182..e70a0f8 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -1,6 +1,7 @@ # Example Gitaly configuration file socket_path = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket" +internal_socket_dir = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket" # The directory where Gitaly's executables are stored bin_dir = "{{ ansible_user_dir }}/bin" @@ -42,6 +43,7 @@ dir = "{{ ansible_user_dir }}/log/gitaly" [gitaly-ruby] # The directory where gitaly-ruby is installed dir = "{{ ansible_user_dir }}/gitaly/ruby" +num_workers = 4 # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 300000000

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1589'
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 5d4005abfdbaf1e9a676ded589ebb9a3ae6f9b3e Merge: 5fea7d849 e93801bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 13:01:24 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1589' changes/ticket32704 | 3 +++ scripts/maint/format_changelog.py | 41 ++++++++++++++++++++------------------- scripts/maint/sortChanges.py | 11 ++++++----- 3 files changed, 30 insertions(+), 25 deletions(-)

1 0

[tor/master] Port changelog tools to python 3
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit e93801bfe6561975a23a3ca39a7465b5ac376998 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 10:53:48 2019 -0500 Port changelog tools to python 3 Closes ticket 32704. --- changes/ticket32704 | 3 +++ scripts/maint/format_changelog.py | 41 ++++++++++++++++++++------------------- scripts/maint/sortChanges.py | 11 ++++++----- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/changes/ticket32704 b/changes/ticket32704 new file mode 100644 index 000000000..4cc001975 --- /dev/null +++ b/changes/ticket32704 @@ -0,0 +1,3 @@ + o Minor features (release tools): + - Port our changelog formatting and sorting tools to Python 3. + Closes ticket 32704. diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 08b2155fa..97a6ce938 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -9,6 +9,7 @@ # To run it, pipe a section of the changelog (starting with "Changes # in Tor 0.x.y.z-alpha" through the script.) +from __future__ import print_function import os import re import sys @@ -190,7 +191,7 @@ def body_parser(line): elif re.match(r'^\s+\S', line): return TP_HEADTEXT else: - print "Weird line %r"%line + print("Weird line %r"%line, file=sys.stderr) def clean_head(head): return head @@ -198,7 +199,7 @@ def clean_head(head): def head_score(s): m = re.match(r'^ +o (.*)', s) if not m: - print >>sys.stderr, "Can't score %r"%s + print("Can't score %r"%s, file=sys.stderr) return 99999 lw = m.group(1).lower() if lw.startswith("security") and "feature" not in lw: @@ -291,7 +292,7 @@ class ChangeLog(object): def lint_head(self, line, head): m = re.match(r'^ *o ([^\(]+)((?:\([^\)]+\))?):', head) if not m: - print >>sys.stderr, "Weird header format on line %s"%line + print("Weird header format on line %s"%line, file=sys.stderr) def lint_item(self, line, grafs, head_type): pass @@ -306,7 +307,7 @@ class ChangeLog(object): def dumpGraf(self,par,indent1,indent2=-1): if not self.wrapText: for line in par: - print line + print(line) return if indent2 == -1: @@ -320,17 +321,17 @@ class ChangeLog(object): def dumpPreheader(self, graf): self.dumpGraf(graf, 0) - print + print() def dumpMainhead(self, head): - print head + print(head) def dumpHeadGraf(self, graf): self.dumpGraf(graf, 2) - print + print() def dumpSectionHeader(self, header): - print header + print(header) def dumpStartOfSections(self): pass @@ -339,10 +340,10 @@ class ChangeLog(object): pass def dumpEndOfSection(self): - print + print() def dumpEndOfChangelog(self): - print + print() def dumpDrupalBreak(self): pass @@ -350,7 +351,7 @@ class ChangeLog(object): def dumpItem(self, grafs): self.dumpGraf(grafs[0],4,6) for par in grafs[1:]: - print + print() self.dumpGraf(par,6,6) def collateAndSortSections(self): @@ -389,7 +390,7 @@ class ChangeLog(object): self.dumpStartOfSections() for _,head,items in self.sections: if not head.endswith(':'): - print >>sys.stderr, "adding : to %r"%head + print("adding : to %r"%head, file=sys.stderr) head = head + ":" self.dumpSectionHeader(head) for _,grafs in items: @@ -445,16 +446,16 @@ class HTMLChangeLog(ChangeLog): pass def dumpStartOfSections(self): - print "<ul>\n" + print("<ul>\n") def dumpEndOfSections(self): - print "</ul>\n" + print("</ul>\n") def dumpDrupalBreak(self): - print "\n</ul>\n" - print "<p> </p>" - print "\n\n\n" - print "<ul>" + print("\n</ul>\n") + print("<p> </p>") + print("\n\n\n") + print("<ul>") def dumpItem(self, grafs): grafs[0][0] = grafs[0][0].replace(" - ", "", 1).lstrip() @@ -464,7 +465,7 @@ class HTMLChangeLog(ChangeLog): self.htmlPar(par) else: self.htmlText(grafs[0]) - print + print() op = optparse.OptionParser(usage="usage: %prog [options] [filename]") op.add_option('-W', '--no-wrap', action='store_false', @@ -560,7 +561,7 @@ if options.firstOnly: sys.exit(0) if nextline is not None: - print nextline + print(nextline) for line in sys.stdin: sys.stdout.write(line) diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py index 986b94b02..44dd0dc41 100755 --- a/scripts/maint/sortChanges.py +++ b/scripts/maint/sortChanges.py @@ -7,6 +7,7 @@ changelog. """ +from __future__ import print_function import re import sys @@ -43,7 +44,7 @@ REPLACEMENTS = { def score(s,fname=None): m = re.match(r'^ +o ([^\n]*)\n(.*)', s, re.M|re.S) if not m: - print >>sys.stderr, "Can't score %r from %s"%(s,fname) + print("Can't score %r from %s"%(s,fname), file=sys.stderr) heading = m.group(1) heading = REPLACEMENTS.get(heading, heading) lw = m.group(1).lower() @@ -100,9 +101,9 @@ changes.sort() last_lw = "this is not a header" for _, lw, header, rest in changes: if lw == last_lw: - print rest, + print(rest, end="") else: - print - print " o",header - print rest, + print() + print(" o",header) + print(rest, end="") last_lw = lw

1 0