Unverified Commit 0f2349d1 authored by Philipp Winter's avatar Philipp Winter
Browse files

Merge branch 'release-0.9.3'

parents ae0c4eb8 0594e98d

.travis.requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#     $ make coverage

#

#------------------------------------------------------------------------------

attrs==19.2.0

Babel==2.8.0

BeautifulSoup==3.2.2

Mako==1.1.1

CHANGELOG

+5 −0
Original line number Diff line number Diff line 
Changes in version 0.9.3 - 2020-02-18



        * FIXES <https://bugs.torproject.org/33299>

        This patch disables the distribution of FTE, ScrambleSuit, and obfs3.



Changes in version 0.9.2 - 2020-02-04



        * FIXES <https://bugs.torproject.org/31427>

bridgedb.conf

+3 −3
Original line number Diff line number Diff line
@@ -282,10 +282,10 @@ TASKS = { 
# to booleans. If ``True``, the PT is distributed; if ``False``, it isn't.

SUPPORTED_TRANSPORTS = {

    'obfs2': False,

    'obfs3': True,

    'obfs3': False,

    'obfs4': True,

    'scramblesuit': True,

    'fte': True,

    'scramblesuit': False,

    'fte': False,

}



# PROBING_RESISTANT_TRANSPORTS is a list of transports that are resistant to

bridgedb/bridges.py

+3 −4
Original line number Diff line number Diff line
@@ -335,8 +335,7 @@ class PluggableTransport(BridgeAddressBase): 
    :vartype methodname: str

    :ivar methodname: The canonical "name" for this pluggable transport,

        i.e. the one which would be specified in a torrc file. For example,

        ``"obfs2"``, ``"obfs3"``, ``"scramblesuit"`` would all be pluggable

        transport method names.

        ``"obfs4"``.



    :vartype address: ``ipaddr.IPv4Address`` or ``ipaddr.IPv6Address``

    :ivar address: The IP address of the transport. Currently (as of 20 March
@@ -514,7 +513,7 @@ class PluggableTransport(BridgeAddressBase): 


        :rtype: str

        :returns: The (lowercased) methodname of this ``PluggableTransport``,

            i.e. ``"obfs3"``, ``"scramblesuit"``, etc.

            e.g. ``"obfs4"``.

        """

        return self._methodname
@@ -1413,7 +1412,7 @@ class Bridge(BridgeBackwardsCompatibility): 


        :param str countryCode: A two-character country code specifier.

        :param str methodname: The type of pluggable transport to check,

            i.e. ``'obfs3'``.

            e.g. ``'obfs4'``.

        :rtype: bool

        :returns: ``True`` if any address:port pair which this bridge is

            running a :class:`PluggableTransport` on is blocked in

bridgedb/distributors/https/server.py

+1 −4
Original line number Diff line number Diff line
@@ -128,10 +128,7 @@ def replaceErrorPage(request, error, template_name=None, html=True): 
    # "BridgeDB"

    # "pluggable transport"

    # "pluggable transports"

    # "obfs2"

    # "obfs3"

    # "scramblesuit"

    # "fteproxy"

    # "obfs4"

    # "Tor"

    # "Tor Browser"

    #