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

[tor/master] Appveyor CI: fix some typos
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 02a45b3ea478b8295a3e15a0a301ce902fba0227 Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:49:11 2018 +1000 Appveyor CI: fix some typos --- scripts/test/appveyor-irc-notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index b06534c3f..59514bebe 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -55,7 +55,7 @@ export APPVEYOR_URL=https://ci.appveyor.com export APPVEYOR_PROJECT_NAME=tor export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 -export APPVEYOR_REPO_PROVIDER=gihub +export APPVEYOR_REPO_PROVIDER=github export APPVEYOR_REPO_BRANCH=repo_branch export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title export APPVEYOR_BUILD_VERSION=1 @@ -88,7 +88,7 @@ import time def appveyor_vars(): """ - Return a dict of key value carfted from appveyor environment variables. + Return a dict of key value crafted from appveyor environment variables. """ vars = dict([

1 0

[tor/master] Merge remote-tracking branch 'teor/bug26979'
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit d66cfadbd3ea5dc11fbb905f82d3fbfc1ba7b07a Merge: de4d7c383 c3fca338a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:26:15 2018 -0400 Merge remote-tracking branch 'teor/bug26979' changes/bug26979 | 4 ++ scripts/test/appveyor-irc-notify.py | 83 ++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 28 deletions(-)

1 0

[tor/master] Appveyor CI: sort environmental variables
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit c6973aeccb2d65aaed104996d3cd5048421348ab Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:54:02 2018 +1000 Appveyor CI: sort environmental variables To avoid future duplicates. --- scripts/test/appveyor-irc-notify.py | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index 59514bebe..639acc6ce 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -51,19 +51,19 @@ delineate multiple messages. Example: -export APPVEYOR_URL=https://ci.appveyor.com +export APPVEYOR_ACCOUNT_NAME=isislovecruft +export APPVEYOR_BUILD_VERSION=1 export APPVEYOR_PROJECT_NAME=tor -export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft -export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 -export APPVEYOR_REPO_PROVIDER=github -export APPVEYOR_REPO_BRANCH=repo_branch +export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title -export APPVEYOR_BUILD_VERSION=1 +export APPVEYOR_REPO_BRANCH=repo_branch export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8 +export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test" -export APPVEYOR_ACCOUNT_NAME=isislovecruft -export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number +export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 export APPVEYOR_REPO_NAME=isislovecruft/tor +export APPVEYOR_REPO_PROVIDER=github +export APPVEYOR_URL=https://ci.appveyor.com python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}','Build #{build_version} passed. Details: {build_url} | Commit: {commit_url} See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for examples @@ -96,25 +96,25 @@ def appveyor_vars(): v.replace('APPVEYOR_', '').lower(), os.getenv(v, '').decode('utf-8') ) for v in [ - 'APPVEYOR_URL', - 'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED', - 'APPVEYOR_REPO_BRANCH', - 'APPVEYOR_REPO_COMMIT_AUTHOR', - 'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL', - 'APPVEYOR_REPO_COMMIT_TIMESTAMP', - 'APPVEYOR_REPO_PROVIDER', + 'APPVEYOR_ACCOUNT_NAME', + 'APPVEYOR_BUILD_VERSION', 'APPVEYOR_PROJECT_NAME', - 'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', - 'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH', 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', + 'APPVEYOR_PULL_REQUEST_NUMBER', 'APPVEYOR_PULL_REQUEST_TITLE', - 'APPVEYOR_BUILD_VERSION', + 'APPVEYOR_REPO_BRANCH', 'APPVEYOR_REPO_COMMIT', + 'APPVEYOR_REPO_COMMIT_AUTHOR', + 'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL', 'APPVEYOR_REPO_COMMIT_MESSAGE', - 'APPVEYOR_ACCOUNT_NAME', - 'APPVEYOR_PULL_REQUEST_NUMBER', + 'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED', + 'APPVEYOR_REPO_COMMIT_TIMESTAMP', 'APPVEYOR_REPO_NAME', + 'APPVEYOR_REPO_PROVIDER', 'APPVEYOR_REPO_TAG_NAME', + 'APPVEYOR_URL', ] ])

1 0

[tor/master] Re-wrap the error message emitted by checkIncludes.py
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit 294f580f042be51150ef89e72243cd470f80796d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 15:47:46 2018 -0400 Re-wrap the error message emitted by checkIncludes.py --- scripts/maint/checkIncludes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 5cf7ead47..eb25cb209 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -81,6 +81,6 @@ for dirpath, dirnames, fnames in os.walk("src"): if trouble: err( -"""To change which includes are allowed in a C file, edit the {} files in its -enclosing directory.""".format(RULES_FNAME)) +"""To change which includes are allowed in a C file, edit the {} +files in its enclosing directory.""".format(RULES_FNAME)) sys.exit(1)

1 0

[tor/master] Add a little documentation to checkIncludes.py.
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit ee1228622291217fd2614a4e29469559b8dc4129 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 16:02:31 2018 -0400 Add a little documentation to checkIncludes.py. Someday people might be glad I did. --- scripts/maint/checkIncludes.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index eb25cb209..d13ff565c 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -1,6 +1,21 @@ #!/usr/bin/python3 # Copyright 2018 The Tor Project, Inc. See LICENSE file for licensing info. +"""This script looks through all the directories for files matching *.c or + *.h, and checks their #include directives to make sure that only "permitted" + headers are included. + + Any #include directives with angle brackets (like #include <stdio.h>) are + ignored -- only directives with quotes (like #include "foo.h") are + considered. + + To decide what includes are permitted, this script looks at a .may_include + file in each directory. This file contains empty lines, #-prefixed + comments, filenames (like "lib/foo/bar.h") and file globs (like lib/*/*.h) + for files that are permitted. +""" + + from __future__ import print_function import fnmatch @@ -8,20 +23,26 @@ import os import re import sys +# Global: Have there been any errors? trouble = False def err(msg): + """ Declare that an error has happened, and remember that there has + been an error. """ global trouble trouble = True print(msg, file=sys.stderr) def fname_is_c(fname): + """ Return true iff 'fname' is the name of a file that we should + search for possibly disallowed #include directives. """ return fname.endswith(".h") or fname.endswith(".c") INCLUDE_PATTERN = re.compile(r'\s*#\s*include\s+"([^"]*)"') RULES_FNAME = ".may_include" class Rules(object): + """ A 'Rules' object is the parsed version of a .may_include file. """ def __init__(self, dirpath): self.dirpath = dirpath self.patterns = [] @@ -59,6 +80,7 @@ class Rules(object): print("Pattern {} in {} was never used.".format(p, self.dirpath)) def load_include_rules(fname): + """ Read a rules file from 'fname', and return it as a Rules object. """ result = Rules(os.path.split(fname)[0]) with open(fname, 'r') as f: for line in f:

1 0

[tor/master] Run check-includes.py script with detected python path.
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit aeffbe51017c7b4f401ab5c658075417610caccd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 09:07:19 2018 -0400 Run check-includes.py script with detected python path. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index adeca6e43..73dc56b28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -314,7 +314,7 @@ endif check-includes: if USEPYTHON - $(top_srcdir)/scripts/maint/checkIncludes.py + $(PYTHON) $(top_srcdir)/scripts/maint/checkIncludes.py endif check-docs: all

1 0

[tor/master] Merge branch 'ticket26447'
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit de4d7c3837c36fa4c78d10a49837ba505d723727 Merge: fe9f58514 aeffbe510 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:21:10 2018 -0400 Merge branch 'ticket26447' Makefile.am | 4 ++-- changes/ticket26447 | 5 +++++ scripts/maint/checkIncludes.py | 26 ++++++++++++++++++++++++-- 3 files changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Add "check-includes" to check-local.
by nickm＠torproject.org 31 Jul '18

31 Jul '18

commit cade65fd2e6bbf12e279dcd0f5e8da40b65d06a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 15:53:19 2018 -0400 Add "check-includes" to check-local. --- Makefile.am | 2 +- changes/ticket26447 | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0f934cf0f..adeca6e43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -197,7 +197,7 @@ doxygen: test: all $(top_builddir)/src/test/test -check-local: check-spaces check-changes +check-local: check-spaces check-changes check-includes need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ diff --git a/changes/ticket26447 b/changes/ticket26447 new file mode 100644 index 000000000..757a4022f --- /dev/null +++ b/changes/ticket26447 @@ -0,0 +1,5 @@ + o Minor features (code correctness, testing): + - Tor's build process now includes a "check-includes" make target + to verify that no module of Tor relies on any headers from a + higher-level module. We hope to use this feature over time to + help refactor our codebase. Closes ticket 26447.

1 0

[metrics-web/master] Update to latest metrics-base.
by karsten＠torproject.org 31 Jul '18

31 Jul '18

commit 963da56fa8db87a993561bc187e63b64d4881b29 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 31 13:32:57 2018 +0200 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 23c6e0b..08514a3 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 23c6e0be5fab9463f137615053ef412e4da2315e +Subproject commit 08514a32afefbeef848b80f9a338ee840c282604

1 0

[metrics-web/master] Update news.json to version 283 of doc/MetricsTimeline.
by karsten＠torproject.org 31 Jul '18

31 Jul '18

commit de445982e280103ffacc5f89f048f4106405e435 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 31 13:32:39 2018 +0200 Update news.json to version 283 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 105 ++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 6 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index ac2acfc..f0440a6 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -935,6 +935,11 @@ } ] }, { "start" : "2014-09-29", + "protocols" : [ "meek" ], + "short_description" : "Changed the bridge backing meek-amazon.", + "description" : "Changed the bridge backing meek-amazon." +}, { + "start" : "2014-09-29", "places" : [ "cn" ], "short_description" : "China blocks Instagram in response to ongoing protests in Hong Kong", "description" : "China blocks Instagram in response to ongoing protests in Hong Kong. A research paper by Hobbs and Roberts shows evidence for an increase in circumvention, but the measurable effect on Tor is slight if anything.", @@ -952,11 +957,6 @@ "target" : "http://www.margaretroberts.net/wp-content/uploads/2016/08/selfiecensorship.…" } ] }, { - "start" : "2014-09-29", - "protocols" : [ "meek" ], - "short_description" : "Changed the bridge backing meek-amazon.", - "description" : "Changed the bridge backing meek-amazon." -}, { "start" : "2014-10-14", "protocols" : [ "meek" ], "short_description" : "Enabled PublishServerDescriptor on the meek-amazon bridge", @@ -2896,6 +2896,15 @@ "target" : "https://www.reuters.com/article/us-sri-lanka-clashes-socialmedia/sri-lanka-…" } ] }, { + "start" : "2018-03-12", + "protocols" : [ "ipv4", "ipv6" ], + "short_description" : "geoip and geoip6 databases updated to \"March 8 2018 Maxmind GeoLite2 Country\"", + "description" : "geoip and geoip6 databases updated to \"March 8 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 0FD75C42A32E82100361BD367CB13862806E6A13</code>, <code>geoip6-db-digest 5AFA101C4A6AD4289CEE4575943D6BA851606245</code>).", + "links" : [ { + "label" : "commit", + "target" : "https://gitweb.torproject.org/tor.git/commit/?id=3418a3a7f0199c0573213dfa58…" + } ] +}, { "start" : "2018-03-14", "protocols" : [ "snowflake" ], "short_description" : "Deployed an attempt to fix frequent crashes of the fallback snowflake proxies.", @@ -3002,6 +3011,15 @@ "target" : "https://bugs.torproject.org/25688#comment:1" } ] }, { + "start" : "2018-04-05", + "protocols" : [ "ipv4", "ipv6" ], + "short_description" : "geoip and geoip6 databases updated to \"April 3 2018 Maxmind GeoLite2 Country\"", + "description" : "geoip and geoip6 databases updated to \"April 3 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 8A53650327E8D30E971DC90F564BA9BD1A513F19</code>, <code>geoip6-db-digest 698852511F6BC27DFFC115805044C71FDCCF70AF</code>).", + "links" : [ { + "label" : "commit", + "target" : "https://gitweb.torproject.org/tor.git/commit/?id=1fa396b0a49448103ad16cb411…" + } ] +}, { "start" : "2018-04-13", "protocols" : [ "snowflake" ], "short_description" : "Snowflake client registrations", @@ -3099,6 +3117,15 @@ "target" : "https://bugs.torproject.org/26111" } ] }, { + "start" : "2018-05-15", + "protocols" : [ "ipv4", "ipv6" ], + "short_description" : "geoip and geoip6 databases updated to \"May 1 2018 Maxmind GeoLite2 Country\"", + "description" : "geoip and geoip6 databases updated to \"May 1 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 765D2F123DDA7DAEA9C9263975E2B4BAFBD2B908</code>, <code>geoip6-db-digest 2AA568CC898BF9924FBACEA26946AA7ED10E7D87</code>).", + "links" : [ { + "label" : "commit", + "target" : "https://gitweb.torproject.org/tor.git/commit/?id=033e4723f3651062779ff64a61…" + } ] +}, { "start" : "2018-06-09", "protocols" : [ "meek" ], "short_description" : "Release of Tor Browser 7.5.5, removes meek-amazon option.", @@ -3117,6 +3144,15 @@ "target" : "https://blog.torproject.org/tor-browser-80a8-released" } ] }, { + "start" : "2018-06-11", + "protocols" : [ "ipv4", "ipv6" ], + "short_description" : "geoip and geoip6 databases updated to \"June 7 2018 Maxmind GeoLite2 Country\"", + "description" : "geoip and geoip6 databases updated to \"June 7 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest 93112125248AD2C11A2531B934FD4AC03999738D</code>, <code>geoip6-db-digest BFD2B453F2D9DC875B7B0C464A185E6C3202534F</code>).", + "links" : [ { + "label" : "commit", + "target" : "https://gitweb.torproject.org/tor.git/commit/?id=ae540569ce25041db6e78119b2…" + } ] +}, { "start" : "2018-06-20", "ongoing" : true, "places" : [ "ve" ], @@ -3174,10 +3210,52 @@ "target" : "https://bugs.torproject.org/26661" } ] }, { + "start" : "2018-07-06", + "protocols" : [ "ipv4", "ipv6" ], + "short_description" : "geoip and geoip6 databases updated to \"July 3 2018 Maxmind GeoLite2 Country\"", + "description" : "geoip and geoip6 databases updated to \"July 3 2018 Maxmind GeoLite2 Country\" (<code>geoip-db-digest CFFD7B0544879150A31F966E83DBB7DDDFA16F49</code>, <code>geoip6-db-digest B25710F60CB23F0C76F58AFB0A26A26ACB701BB2</code>).", + "links" : [ { + "label" : "commit", + "target" : "https://gitweb.torproject.org/tor.git/commit/?id=9faa28b60e5012549a2ea20702…" + } ] +}, { + "start" : "2018-07-06", + "protocols" : [ "bridge" ], + "short_description" : "The bridge authority Bifroest stops publishing bridge descriptors", + "description" : "The bridge authority Bifroest stops publishing bridge descriptors. Bridge stats are unavailable until 2018-07-13 and the introduction of a new bridge authority.", + "links" : [ { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26711" + }, { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26771" + }, { + "label" : "mailing list post", + "target" : "https://lists.torproject.org/pipermail/metrics-team/2018-July/000863.html" + }, { + "label" : "number of bridges graph", + "target" : "https://metrics.torproject.org/networksize.html?start=2018-06-01&end=2018-0…" + } ] +}, { + "start" : "2018-07-13", + "protocols" : [ "bridge" ], + "short_description" : "The replacement bridge authority Serge begins publishing bridge descriptors.", + "description" : "The replacement bridge authority Serge begins publishing bridge descriptors.", + "links" : [ { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26771" + }, { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26786" + }, { + "label" : "number of bridges graph", + "target" : "https://metrics.torproject.org/networksize.html?start=2018-06-01&end=2018-0…" + } ] +}, { "start" : "2018-07-14", "protocols" : [ "bridge" ], "short_description" : "Release of Tor 0.2.9.16, 0.3.2.11, 0.3.3.9, and 0.3.4.5-rc", - "description" : "Release of Tor 0.2.9.16, 0.3.2.11, 0.3.3.9, and 0.3.4.5-rc. Switches bridge authority from Bifroest to <a href=\"https://metrics.torproject.org/rs.html#details/BA44A889E64B93FAA2B114E02C2A…">Serge</a>.", + "description" : "Release of Tor 0.2.9.16, 0.3.2.11, 0.3.3.9, and 0.3.4.5-rc. Switches bridge authority from Bifroest to <a href=\"https://metrics.torproject.org/rs.html#details/BA44A889E64B93FAA2B114E02C2A…">Serge</a>. The number of bridges begins counting up from zero as bridges are upgraded. The estimated number of bridge users remained unavailable until 2018-07-21 because of the discontinuity.", "links" : [ { "label" : "announcement", "target" : "https://lists.torproject.org/pipermail/tor-relays/2018-July/015681.html" @@ -3187,6 +3265,9 @@ }, { "label" : "blog post", "target" : "https://blog.torproject.org/new-release-tor-0339-bridge-authority-update" + }, { + "label" : "number of bridges graph", + "target" : "https://metrics.torproject.org/networksize.html?start=2018-06-01&end=2018-0…" } ] }, { "start" : "2018-07-15", @@ -3198,6 +3279,18 @@ "target" : "https://bugs.torproject.org/26783#comment:1" } ] }, { + "start" : "2018-07-21", + "protocols" : [ "bridge" ], + "short_description" : "The estimated number of bridge users becomes available again, following the introduction of the new bridge authority Serge on 2018-07-13", + "description" : "The estimated number of bridge users becomes available again, following the introduction of the new bridge authority Serge on 2018-07-13. The stats took about a week to reappear because of the discontinuity in bridge reporting affecting the estimated fraction of reporting bridges.", + "links" : [ { + "label" : "mailing list post", + "target" : "https://lists.torproject.org/pipermail/metrics-team/2018-July/000866.html" + }, { + "label" : "graph", + "target" : "https://metrics.torproject.org/userstats-bridge-country.html?start=2018-06-…" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0