February 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Fix 025 EOL date
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit b909aed534dd50f59ee771c505a26b42a4f6a3de Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:48:15 2017 -0500 Fix 025 EOL date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a80b39c..ca5abb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Changes in version 0.2.5.13 - 2017-03-?? release series. Note that support for Tor 0.2.5.x is ending next year: we will not issue - any fixes for the Tor 0.2.5.x series after 1 August 2018. If you need + any fixes for the Tor 0.2.5.x series after 1 May 2018. If you need a Tor release series with longer-term support, we recommend Tor 0.2.9.x. o Directory authority changes (backport from 0.2.8.5-rc):

1 0

[tor/release-0.2.9] Fix 029 EOL
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit 4cdb7bf450a7c8d6575494c0a2d191f75faa4844 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:49:04 2017 -0500 Fix 029 EOL --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 973a43c..4e9dc9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ Changes in version 0.2.9.10 - 2017-03-?? The Tor 0.2.9.x release series is now marked as a long-term-support series. We intend to backport security fixes to 0.2.9.x until at - least March of 2020. + least January of 2020. o Major bugfixes (directory authority, 0.3.0.3-alpha): - During voting, when marking a relay as a probable sybil, do not

1 0

[tor/release-0.2.9] Begin work on an 0.2.9.10 changelog
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit a98608efe8052c8a19e1f9e75d31e93a7a29d718 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:18:17 2017 -0500 Begin work on an 0.2.9.10 changelog This one is much more normal than the 0.2.[45678] changelogs I just started, since there has been a much shorter gap since the most recent 0.2.9 release. --- ChangeLog | 64 +++++++++++++++++++++++++++++++++++++++++++++ changes/21359 | 8 ------ changes/bug21108_029 | 6 ----- changes/bug21278_extras | 3 --- changes/bug21278_prevention | 4 --- changes/bug21280 | 5 ---- changes/bug21357 | 7 ----- changes/bug21450 | 4 --- changes/geoip-february2017 | 4 --- changes/trove-2017-001.2 | 8 ------ 10 files changed, 64 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index 512c245..973a43c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,67 @@ +Changes in version 0.2.9.10 - 2017-03-?? + Tor 0.2.9.10 backports a security fix from later Tor releass. + + Tor 0.2.9.10 also includes fixes for some major issues affecting + directory authorities, LibreSSL compatibility, and IPv6 correctness. + + The Tor 0.2.9.x release series is now marked as a long-term-support + series. We intend to backport security fixes to 0.2.9.x until at + least March of 2020. + + o Major bugfixes (directory authority, 0.3.0.3-alpha): + - During voting, when marking a relay as a probable sybil, do not + clear its BadExit flag: sybils can still be bad in other ways + too. (We still clear the other flags.) Fixes bug 21108; bugfix + on 0.2.0.13-alpha. + + o Major bugfixes (IPv6 Exits, backport from 0.3.0.3-alpha): + - Stop rejecting all IPv6 traffic on Exits whose exit policy rejects + any IPv6 addresses. Instead, only reject a port over IPv6 if the + exit policy rejects that port on more than an IPv6 /16 of + addresses. This bug was made worse by 17027 in 0.2.8.1-alpha, + which rejected a relay's own IPv6 address by default. Fixes bug + 21357; bugfix on commit 004f3f4e53 in 0.2.4.7-alpha. + + o Major bugfixes (parsing, also in 0.3.0.4-rc): + - Fix an integer underflow bug when comparing malformed Tor versions. + This bug is harmless, except when Tor has been built with + --enable-expensive-hardening, which would turn it into a crash; + or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with + -ftrapv by default. + Part of TROVE-2017-001. Fixes bug 21278; bugfix on + 0.0.8pre1. Found by OSS-Fuzz. + + o Minor features (directory authority, also in 0.3.0.4-rc): + - Directory authorities now reject descriptors that claim to be + malformed versions of Tor. Helps prevent exploitation of bug 21278. + + o Minor features (portability, compilation, backport from 0.3.0.3-alpha): + - Autoconf now checks to determine if OpenSSL structures are opaque, + instead of explicitly checking for OpenSSL version numbers. Part + of ticket 21359. + - Support building with recent LibreSSL code that uses opaque + structures. Closes ticket 21359. + + o Minor features (geoip): + - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (code correctness, also in 0.3.0.4-rc): + - Repair a couple of (unreachable or harmless) cases of the risky + comparison-by-subtraction pattern that caused bug 21278. + + o Minor bugfixes (tor-resolve, backport from 0.3.0.3-alpha): + - The tor-resolve command line tool now rejects hostnames over 255 + characters in length. Previously, it would silently truncate them, + which could lead to bugs. Fixes bug 21280; bugfix on 0.0.9pre5. + Patch by "junglefowl". + + o Minor bugfixes (voting consistency, also in 0.3.0.4-rc): + - Reject version numbers with components that exceed INT32_MAX. + Otherwise 32-bit and 64-bit platforms would behave inconsistently. + Fixes bug 21450; bugfix on 0.0.8pre1. + + Changes in version 0.2.9.9 - 2017-01-23 Tor 0.2.9.9 fixes a denial-of-service bug where an attacker could cause relays and clients to crash, even if they were not built with diff --git a/changes/21359 b/changes/21359 deleted file mode 100644 index cc9b377..0000000 --- a/changes/21359 +++ /dev/null @@ -1,8 +0,0 @@ - - o Minor features (portability, compilationc) - - Support building with recent LibreSSL code that uses opaque - structures. Closes ticket 21359. - - Autoconf now check to determine if OpenSSL - structures are opaque, instead of explicitly checking for - OpenSSL version numbers. - Part of ticket 21359. diff --git a/changes/bug21108_029 b/changes/bug21108_029 deleted file mode 100644 index 3a3f004..0000000 --- a/changes/bug21108_029 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (directory authority): - - During voting, when marking a node as a probable sybil, do not - clear its BadExit flag: sybils can still be bad in other ways - too. (We still clear the other flags.) Fixes bug 21108; bugfix - on 0.2.0.13-alpha. - diff --git a/changes/bug21278_extras b/changes/bug21278_extras deleted file mode 100644 index ffdf4a0..0000000 --- a/changes/bug21278_extras +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (code correctness): - - Repair a couple of (unreachable or harmless) cases of the risky - comparison-by-subtraction pattern that caused bug 21278. diff --git a/changes/bug21278_prevention b/changes/bug21278_prevention deleted file mode 100644 index e07f0a6..0000000 --- a/changes/bug21278_prevention +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (directory authority): - - Directory authorities now reject descriptors that claim to be - malformed versions of Tor. Helps prevent exploitation of bug 21278. - diff --git a/changes/bug21280 b/changes/bug21280 deleted file mode 100644 index e9f0bc1..0000000 --- a/changes/bug21280 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (tor-resolve): - - The tor-resolve command line tool now rejects hostnames over 255 - characters in length. Previously, it would silently truncate - them, which could lead to bugs. Fixes bug 21280; bugfix on 0.0.9pre5. - Patch by "junglefowl". diff --git a/changes/bug21357 b/changes/bug21357 deleted file mode 100644 index a1cb43a..0000000 --- a/changes/bug21357 +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (IPv6 Exits): - - Stop rejecting all IPv6 traffic on Exits whose exit policy rejects IPv6 - addresses. Instead, only reject a port over IPv6 if the exit policy - rejects that port on more than an IPv6 /16 of addresses. This bug was - made worse by 17027 in 0.2.8.1-alpha, which rejects a relay's own IPv6 - address by default. - Fixes bug 21357; bugfix on commit 004f3f4e53 in 0.2.4.7-alpha. diff --git a/changes/bug21450 b/changes/bug21450 deleted file mode 100644 index a1cf89a..0000000 --- a/changes/bug21450 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (voting consistency): - - Reject version numbers with components that exceed INT32_MAX. - Otherwise 32-bit and 64-bit platforms would behave inconsistently. - Fixes bug 21450; bugfix on 0.0.8pre1. diff --git a/changes/geoip-february2017 b/changes/geoip-february2017 deleted file mode 100644 index ec54b61..0000000 --- a/changes/geoip-february2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/trove-2017-001.2 b/changes/trove-2017-001.2 deleted file mode 100644 index 3ef073c..0000000 --- a/changes/trove-2017-001.2 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (parsing): - - Fix an integer underflow bug when comparing malformed Tor versions. - This bug is harmless, except when Tor has been built with - --enable-expensive-hardening, which would turn it into a crash; - or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with - -ftrapv by default. - Part of TROVE-2017-001. Fixes bug 21278; bugfix on - 0.0.8pre1. Found by OSS-Fuzz.

1 0

[tor/release-0.2.8] Fix 028 EOL
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit 02772c94ff21a199ddeca72aad87a37374b9e32b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:48:55 2017 -0500 Fix 028 EOL --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc36132..af3f2d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,8 @@ Changes in version 0.2.8.13 - 2017-03-?? release series, and if they build Tor with the --enable-expensive-hardening option. - Note that support for Tor 0.2.8.x is ending this year: we will not issue - any fixes for the Tor 0.2.8.x series after 1 August 2017. If you need + Note that support for Tor 0.2.8.x is ending next year: we will not issue + any fixes for the Tor 0.2.8.x series after 1 Jan 2018. If you need a Tor release series with longer-term support, we recommend Tor 0.2.9.x.

1 0

[tor/release-0.2.8] Start an 0.2.8.13 changelog
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit c159617c0c0078bbbc877c069987dbf94f2cb956 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:08:09 2017 -0500 Start an 0.2.8.13 changelog --- ChangeLog | 26 ++++++++++++++++++++++++++ changes/geoip-february2017 | 4 ---- changes/geoip-january2017 | 4 ---- changes/trove-2017-001.2 | 8 -------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 507e68f..e6e2e9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +Changes in version 0.2.8.13 - 2017-03-?? + Tor 0.2.8.13 backports a security fixes from later Tor + releases. Anybody running Tor 0.2.8.12 or earlier should upgrade to this + this release, if for some reason they cannot upgrade to a later + release series, and if they build Tor with the --enable-expensive-hardening + option. + + Note that support for Tor 0.2.8.x is ending this year: we will not issue + any fixes for the Tor 0.2.8.x series after 1 August 2017. If you need + a Tor release series with longer-term support, we recommend Tor 0.2.9.x. + + + o Major bugfixes (parsing, also in 0.3.0.4-rc): + - Fix an integer underflow bug when comparing malformed Tor versions. + This bug is harmless, except when Tor has been built with + --enable-expensive-hardening, which would turn it into a crash; + or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with + -ftrapv by default. + Part of TROVE-2017-001. Fixes bug 21278; bugfix on + 0.0.8pre1. Found by OSS-Fuzz. + + o Minor features (geoip): + - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 + Country database. + + Changes in version 0.2.8.12 - 2016-12-19 Tor 0.2.8.12 backports a fix for a medium-severity issue (bug 21018 below) where Tor clients could crash when attempting to visit a diff --git a/changes/geoip-february2017 b/changes/geoip-february2017 deleted file mode 100644 index ec54b61..0000000 --- a/changes/geoip-february2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/geoip-january2017 b/changes/geoip-january2017 deleted file mode 100644 index de1a4cb..0000000 --- a/changes/geoip-january2017 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2 - Country database. - diff --git a/changes/trove-2017-001.2 b/changes/trove-2017-001.2 deleted file mode 100644 index 3ef073c..0000000 --- a/changes/trove-2017-001.2 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (parsing): - - Fix an integer underflow bug when comparing malformed Tor versions. - This bug is harmless, except when Tor has been built with - --enable-expensive-hardening, which would turn it into a crash; - or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with - -ftrapv by default. - Part of TROVE-2017-001. Fixes bug 21278; bugfix on - 0.0.8pre1. Found by OSS-Fuzz.

1 0

[tor/release-0.2.8] use singular
by nickm＠torproject.org 23 Feb '17

23 Feb '17

commit 4b8ca2ca71d08ebcf112dffba8051f6b953e8c14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 23 16:32:06 2017 -0500 use singular --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6e2e9e..bc36132 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ Changes in version 0.2.8.13 - 2017-03-?? - Tor 0.2.8.13 backports a security fixes from later Tor + Tor 0.2.8.13 backports a security fix from later Tor releases. Anybody running Tor 0.2.8.12 or earlier should upgrade to this this release, if for some reason they cannot upgrade to a later release series, and if they build Tor with the --enable-expensive-hardening

1 0

[stem/master] Note runtime of static checks
by atagar＠torproject.org 23 Feb '17

23 Feb '17

commit 225b31325a4677f5c4f55f5adc6a9a4950913b7b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 15 10:29:02 2017 -0800 Note runtime of static checks These are pretty lengthy operations so good to know how long they take. --- run_tests.py | 2 ++ test/util.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/run_tests.py b/run_tests.py index 501cbfa..39c44cb 100755 --- a/run_tests.py +++ b/run_tests.py @@ -78,6 +78,7 @@ PYFLAKES_TASK = Task( args = (SRC_PATHS,), is_required = False, print_result = False, + print_runtime = True, ) PYCODESTYLE_TASK = Task( @@ -86,6 +87,7 @@ PYCODESTYLE_TASK = Task( args = (SRC_PATHS, True, True, True), is_required = False, print_result = False, + print_runtime = True, ) if stem.prereq._is_python_26(): diff --git a/test/util.py b/test/util.py index 482677e..1b50369 100644 --- a/test/util.py +++ b/test/util.py @@ -32,6 +32,7 @@ Tasks are... import re import os import sys +import time import stem import stem.prereq @@ -350,7 +351,7 @@ class Task(object): message or list of strings for its results. """ - def __init__(self, label, runner, args = None, is_required = True, print_result = True): + def __init__(self, label, runner, args = None, is_required = True, print_result = True, print_runtime = False): super(Task, self).__init__() self.label = label @@ -358,12 +359,14 @@ class Task(object): self.args = args self.is_required = is_required self.print_result = print_result + self.print_runtime = print_runtime self.error = None self.is_successful = False self.result = None def run(self): + start_time = time.time() println(' %s...' % self.label, STATUS, NO_NL) padding = 50 - len(self.label) @@ -380,6 +383,8 @@ class Task(object): if self.print_result and isinstance(self.result, str): output_msg = self.result + elif self.print_runtime: + output_msg += ' (%0.1fs)' % (time.time() - start_time) println(output_msg, STATUS)

1 0

[stem/master] Avoid an extra read for style checks
by atagar＠torproject.org 23 Feb '17

23 Feb '17

commit bf6d1b56153dc5133b67dbcc3b7e661b2d6b5881 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 22 10:34:27 2017 -0800 Avoid an extra read for style checks Our StyleReport already reads all the files so no need for us to read them again afterward. I hoped this would speed up the static checks but no such luck. :( Still gonna include this since it's cleaner and I've made a handful of minor edge case fixes while attempting to improve it. --- stem/util/test_tools.py | 89 +++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 3b11713..f2da36f 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -163,10 +163,7 @@ def is_pycodestyle_available(): else: return False - if not hasattr(pycodestyle, 'BaseReport'): - return False - else: - return True + return hasattr(pycodestyle, 'BaseReport') def stylistic_issues(paths, check_newlines = False, check_exception_keyword = False, prefer_single_quotes = False): @@ -258,6 +255,50 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa def __init__(self, options): super(StyleReport, self).__init__(options) + def init_file(self, filename, lines, expected, line_offset): + super(StyleReport, self).init_file(filename, lines, expected, line_offset) + + if not check_newlines and not check_exception_keyword and not prefer_single_quotes: + return + + is_block_comment = False + + for index, line in enumerate(lines): + content = line.split('#', 1)[0].strip() + + if check_newlines and '\r' in line: + issues.setdefault(filename, []).append(Issue(index + 1, 'contains a windows newline', line)) + + if not content: + continue # blank line + + if '"""' in content: + is_block_comment = not is_block_comment + + if check_exception_keyword and content.startswith('except') and content.endswith(', exc:'): + # Python 2.6 - 2.7 supports two forms for exceptions... + # + # except ValueError, exc: + # except ValueError as exc: + # + # The former is the old method and no longer supported in python 3 + # going forward. + + # TODO: This check only works if the exception variable is called + # 'exc'. We should generalize this via a regex so other names work + # too. + + issues.setdefault(filename, []).append(Issue(index + 1, "except clause should use 'as', not comma", line)) + + if prefer_single_quotes and not is_block_comment: + if '"' in content and "'" not in content and '"""' not in content and not content.endswith('\\'): + # Checking if the line already has any single quotes since that + # usually means double quotes are preferable for the content (for + # instance "I'm hungry"). Also checking for '\' at the end since + # that can indicate a multi-line string. + + issues.setdefault(filename, []).append(Issue(index + 1, 'use single rather than double quotes', line)) + def error(self, line_number, offset, text, check): code = super(StyleReport, self).error(line_number, offset, text, check) @@ -270,46 +311,6 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa style_checker = pycodestyle.StyleGuide(ignore = ignore_rules, reporter = StyleReport) style_checker.check_files(list(_python_files(paths))) - if check_newlines or check_exception_keyword: - for path in _python_files(paths): - with open(path) as f: - file_contents = f.read() - - lines = file_contents.split('\n') - is_block_comment = False - - for index, line in enumerate(lines): - if '"""' in line: - is_block_comment = not is_block_comment - - if check_newlines and '\r' in line: - issues.setdefault(path, []).append(Issue(index + 1, 'contains a windows newline', line)) - elif check_exception_keyword and line.strip().startswith('except') and line.strip().endswith(', exc:'): - # Python 2.6 - 2.7 supports two forms for exceptions... - # - # except ValueError, exc: - # except ValueError as exc: - # - # The former is the old method and no longer supported in python 3 - # going forward. - - # TODO: This check only works if the exception variable is called - # 'exc'. We should generalize this via a regex so other names work - # too. - - issues.setdefault(path, []).append(Issue(index + 1, "except clause should use 'as', not comma", line)) - - if prefer_single_quotes and line and not is_block_comment: - content = line.strip().split('#', 1)[0] - - if '"' in content and "'" not in content and '"""' not in content and not content.endswith('\\'): - # Checking if the line already has any single quotes since that - # usually means double quotes are preferable for the content (for - # instance "I'm hungry"). Also checking for '\' at the end since - # that can indicate a multi-line string. - - issues.setdefault(path, []).append(Issue(index + 1, 'use single rather than double quotes', line)) - return issues

1 0

[stem/master] Short circuit 'is ignored' checks
by atagar＠torproject.org 23 Feb '17

23 Feb '17

commit d7895db5c68bc9083ea2190d58d96f65c1c4bb1a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 22 20:04:58 2017 -0800 Short circuit 'is ignored' checks No noticeable performance improvement, but clearly pointless iterating through everything. --- stem/util/test_tools.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index f2da36f..0d70dc7 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -252,9 +252,6 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa import pycodestyle class StyleReport(pycodestyle.BaseReport): - def __init__(self, options): - super(StyleReport, self).__init__(options) - def init_file(self, filename, lines, expected, line_offset): super(StyleReport, self).init_file(filename, lines, expected, line_offset) @@ -373,18 +370,16 @@ def pyflakes_issues(paths): for ignored_path, ignored_issues in self._ignored_issues.items(): if path.endswith(ignored_path): - is_match = issue in ignored_issues + if issue in ignored_issues: + return True for prefix in [i[:1] for i in ignored_issues if i.endswith('*')]: if issue.startswith(prefix): - is_match = True + return True for suffix in [i[1:] for i in ignored_issues if i.startswith('*')]: if issue.endswith(suffix): - is_match = True - - if is_match: - return True + return True return False

1 0

[sandboxed-tor-browser/master] Bug 21536: Remove asn's scramblesuit bridge from Tor Browser.
by yawning＠torproject.org 23 Feb '17

23 Feb '17

commit 33bfc5e6a6b25b3fa403e56e78917e3c80d3fbd2 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Feb 23 20:30:49 2017 +0000 Bug 21536: Remove asn's scramblesuit bridge from Tor Browser. --- ChangeLog | 1 + data/bridges.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16374c1..0ecc233 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.4 - UNRELEASED: + * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser. * Fix compilation with Go 1.8. Changes in version 0.0.3 - 2017-01-18: diff --git a/data/bridges.json b/data/bridges.json index 8a02ad8..e909209 100644 --- a/data/bridges.json +++ b/data/bridges.json @@ -6,9 +6,6 @@ "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A" ], - "scramblesuit": [ - "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH" - ], "obfs4": [ "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0",

1 0