summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'release/0.6.7'HEADmasterIsis Lovecruft2018-05-21
|\
| * Print fingerprints in hex thank you very much.bridgedb-0.6.7Isis Lovecruft2018-05-21
| * Merge branch 'master' into developIsis Lovecruft2018-05-21
| |\ | |/ |/|
* | Merge branch 'release/0.6.6'Isis Lovecruft2018-05-21
|\ \ | |/
| * Merge branch 'bug26150' into developbridgedb-0.6.6Isis Lovecruft2018-05-21
| |\
| | * Hotfix for strange bridges missing address fields.bug26150Isis Lovecruft2018-05-21
| |/
| * Merge branch 'master' into developIsis Lovecruft2018-05-04
| |\ | |/ |/|
* | Merge branch 'release/0.6.5'Isis Lovecruft2018-05-04
|\ \ | |/
| * Merge branch 'fix/26023' into developbridgedb-0.6.5Isis Lovecruft2018-05-04
| |\
| | * Workaround for datetime exception in Stem for weird ed25519 certs.fix/26023Isis Lovecruft2018-05-04
| |/
| * Merge branch 'feature/25246' into developIsis Lovecruft2018-02-14
| |\
| | * Add script for assigning unallocated bridges to another distributor.feature/25246Isis Lovecruft2018-02-14
| |/
| * Merge branch 'master' into developIsis Lovecruft2018-02-13
| |\ | |/ |/|
* | Merge branch 'release/0.6.4'Isis Lovecruft2018-02-13
|\ \ | |/
| * Merge branch 'fix/24432-ignore-loopback' into developbridgedb-0.6.4Isis Lovecruft2018-02-13
| |\
| | * Add config option to skip loopback addresses in X-Forwarded-For parsing.fix/24432-ignore-loopbackIsis Lovecruft2018-02-13
| |/
| * The JSON data coming into moat is being processed as a str.fix/24432-json-strIsis Lovecruft2018-02-13
| * Merge branch 'master' into developIsis Lovecruft2018-01-23
| |\ | |/ |/|
* | Merge branch 'release/0.6.3'Isis Lovecruft2018-01-23
|\ \ | |/
| * Create CHANGELOG entry for 0.6.3.bridgedb-0.6.3Isis Lovecruft2018-01-23
| * Merge branch 'fix/24432' into developIsis Lovecruft2018-01-23
| |\
| | * Fix problem with "missing resources" on production moat server.fix/24432Isis Lovecruft2018-01-23
| | * Add David's script for running an external meek client.David Fifield2017-11-28
| | * Modify scripts/test-moat to also test production through a meek tunnel.Isis Lovecruft2017-11-28
| * | Merge branch 'fix/24704' into developIsis Lovecruft2018-01-23
| |\ \
| | * | Add more unittests for legacy code in Bridges.py.fix/24704Isis Lovecruft2017-12-22
| * | | Merge branch 'fix/24701' into developIsis Lovecruft2017-12-22
| |\ \ \
| | * | | Delay and then redirect malicious requests.fix/24701Isis Lovecruft2017-12-22
| * | | | Merge branch 'fix/24704' into developIsis Lovecruft2017-12-22
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Filter returned bridges to avoid multiples from the same /16 or /32.Isis Lovecruft2017-12-22
| |/ /
| * | Add CHANGELOG entries for 0.6.2.Isis Lovecruft2017-12-20
| * | Merge branch 'master' into developIsis Lovecruft2017-12-20
| |\ \ | |/ / |/| |
* | | Merge branch 'release/0.6.2'Isis Lovecruft2017-12-20
|\ \ \ | |/ /
| * | Merge branch 'fix/24637' into developbridgedb-0.6.2Isis Lovecruft2017-12-20
| |\ \
| | * | Implement moat error handling when no bridges are available.Isis Lovecruft2017-12-20
| | * | Add a human-readable __str__() method to BridgeRequest classes.Isis Lovecruft2017-12-20
| | * | Clarify the specified moat error if there are no bridges.Isis Lovecruft2017-12-20
| * | | Merge branch 'fix/24636' into developIsis Lovecruft2017-12-20
| |\ \ \ | | |/ / | |/| |
| | * | Change moat API specification to remove "moat-transports" response.fix/24636Isis Lovecruft2017-12-20
| |/ /
| * | Merge branch 'master' into developIsis Lovecruft2017-12-13
| |\ \ | |/ / |/| |
* | | Merge branch 'release/0.6.1'Isis Lovecruft2017-12-13
|\ \ \
| * | | Revert "Change "client-transport" moat resource type to "moat-transports"."bridgedb-0.6.1Isis Lovecruft2017-12-13
| |/ /
| * | Add CHANGELOG entries for 0.6.1.Isis Lovecruft2017-12-13
| * | Change "client-transport" moat resource type to "moat-transports".Isis Lovecruft2017-12-13
| * | Fix quoting in moat specification.Isis Lovecruft2017-12-13
| * | Merge branch 'fix/3015-remove-buckets' into developIsis Lovecruft2017-11-28
| |\ \
| | * | Remove unused bucket functionality.fix/3015-remove-bucketsIsis Lovecruft2017-11-28
| * | | Merge branch 'fix/24460' into developIsis Lovecruft2017-11-28
| |\ \ \
| | * | | Fix error in usage of redirectTo() with a malicious request.fix/24460Isis Lovecruft2017-11-28
| |/ / /
| * | | Fix failing unittest after #24433 merge.Isis Lovecruft2017-11-28
| | |/ | |/|