<feed xmlns='http://www.w3.org/2005/Atom'>
<title>user/phw/bridgedb, branch bridgedb-0.9.3</title>
<subtitle>Philipp's bridgedb repository</subtitle>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/'/>
<entry>
<title>Merge branch 'release-0.9.3'</title>
<updated>2020-02-19T00:07:48+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-19T00:07:48+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=0f2349d1355584cca65c7c7a45a78aea39203b35'/>
<id>0f2349d1355584cca65c7c7a45a78aea39203b35</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bump version number to 0.9.3.</title>
<updated>2020-02-19T00:07:29+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-19T00:07:29+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=0594e98d7de843c9404227e55a8b259dd03e97a3'/>
<id>0594e98d7de843c9404227e55a8b259dd03e97a3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'task/33299' into develop</title>
<updated>2020-02-19T00:05:23+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-19T00:05:23+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=eb12be54ef672bd874b7e85ea0ee5f8dc7282a96'/>
<id>eb12be54ef672bd874b7e85ea0ee5f8dc7282a96</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Explicitly set conflicting requirement for attrs.</title>
<updated>2020-02-18T23:59:45+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-18T17:52:21+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=651e442598f06cfc5ef26fd45984f2f4f50db1dc'/>
<id>651e442598f06cfc5ef26fd45984f2f4f50db1dc</id>
<content type='text'>
This fixes an issue that just emerged in Travis CI:

$ make coverage-test
fatal: No names found, cannot describe anything.
coverage run --rcfile=".coveragerc" -m twisted.trial ./bridgedb/test/test_*.py
Traceback (most recent call last):
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/twisted/trial/__main__.py", line 9, in &lt;module&gt;
    load_entry_point('Twisted', 'console_scripts', 'trial')()
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 489, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2793, in load_entry_point
    return ep.load()
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2410, in load
    self.require(*args, **kwargs)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2433, in require
    items = working_set.resolve(reqs, env, installer, extras=self.extras)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 791, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (attrs 18.2.0 (/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages), Requirement.parse('attrs&gt;=19.2.0'), {'Automat'})
Coverage.py warning: No data was collected. (no-data-collected)
Makefile:76: recipe for target 'coverage-test' failed
make: *** [coverage-test] Error 1
The command "make coverage-test" exited with 2.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This fixes an issue that just emerged in Travis CI:

$ make coverage-test
fatal: No names found, cannot describe anything.
coverage run --rcfile=".coveragerc" -m twisted.trial ./bridgedb/test/test_*.py
Traceback (most recent call last):
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/twisted/trial/__main__.py", line 9, in &lt;module&gt;
    load_entry_point('Twisted', 'console_scripts', 'trial')()
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 489, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2793, in load_entry_point
    return ep.load()
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2410, in load
    self.require(*args, **kwargs)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2433, in require
    items = working_set.resolve(reqs, env, installer, extras=self.extras)
  File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 791, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (attrs 18.2.0 (/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages), Requirement.parse('attrs&gt;=19.2.0'), {'Automat'})
Coverage.py warning: No data was collected. (no-data-collected)
Makefile:76: recipe for target 'coverage-test' failed
make: *** [coverage-test] Error 1
The command "make coverage-test" exited with 2.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix misleading comments.</title>
<updated>2020-02-18T22:12:08+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-18T22:12:08+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=116be8e57f862dbd04e7cb760b86097719d84ee7'/>
<id>116be8e57f862dbd04e7cb760b86097719d84ee7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add CHANGELOG entry for #33299.</title>
<updated>2020-02-13T01:03:10+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-13T00:41:09+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=fd960bdda63051985becaac8ed8ef0925c7b4a2e'/>
<id>fd960bdda63051985becaac8ed8ef0925c7b4a2e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove obfs3 and scramblesuit unit test.</title>
<updated>2020-02-13T01:03:08+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-13T01:02:30+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=9c273d00d5c7ece846146abfd842ad56ddc20602'/>
<id>9c273d00d5c7ece846146abfd842ad56ddc20602</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove outdated comment.</title>
<updated>2020-02-13T00:37:33+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-13T00:37:33+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=777286c048f721e67b5e812929c7ca56c6ee5863'/>
<id>777286c048f721e67b5e812929c7ca56c6ee5863</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Disable FTE, obfs3, and scramblesuit distribution.</title>
<updated>2020-02-13T00:36:19+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-13T00:36:19+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=ab9a188996ee0c131bbe21d107bfe7caf871d0ac'/>
<id>ab9a188996ee0c131bbe21d107bfe7caf871d0ac</id>
<content type='text'>
FTE is no longer part of Tor Browser, and obfs3 and scramblesuit don't
offer anything that obfs4 doesn't already provide.

This fixes &lt;https://bugs.torproject.org/33299&gt;.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
FTE is no longer part of Tor Browser, and obfs3 and scramblesuit don't
offer anything that obfs4 doesn't already provide.

This fixes &lt;https://bugs.torproject.org/33299&gt;.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into develop</title>
<updated>2020-02-04T19:28:50+00:00</updated>
<author>
<name>Philipp Winter</name>
<email>phw@nymity.ch</email>
</author>
<published>2020-02-04T19:28:50+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.torproject.org/user/phw/bridgedb.git/commit/?id=7f1638e1db2a36507f80b6d923baf1f62a7c4491'/>
<id>7f1638e1db2a36507f80b6d923baf1f62a7c4491</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
