[tor-commits] [torspec/master] Merge branch 'tls13'

2018-06-01 Thread isis
commit bbd9567db9f75d78f2f54e575509c2cadaa699d6 Merge: a323d84 fc561d2 Author: Isis Lovecruft Date: Fri Jun 1 22:02:02 2018 + Merge branch 'tls13' proposals/xxx-tls-1.3.txt | 336 ++ 1 file changed, 336

[tor-commits] [torspec/master] WIP Migration to TLS 1.3 proposal.

2018-06-01 Thread isis
commit fc561d2bb586141320306a86f17db9dac6ed0ce8 Author: Isis Lovecruft Date: Tue Jan 23 00:51:09 2018 + WIP Migration to TLS 1.3 proposal. --- proposals/xxx-tls-1.3.txt | 336 ++ 1 file changed, 336 insertions(+) diff --git a/proposals/xxx

[tor-commits] [torspec/master] Add work-in-progress TLS 1.3 proposal as a draft with number 294.

2018-06-01 Thread isis
commit 14cd5da191992645715a74307260059382396ce9 Author: Isis Lovecruft Date: Fri Jun 1 22:07:55 2018 + Add work-in-progress TLS 1.3 proposal as a draft with number 294. --- proposals/000-index.txt| 2 ++ proposals/{xxx-tls-1.3.txt => 294-tls-1.3.txt}

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2018-05-21 Thread isis
commit 5ca53926d4bf32fe2cdd2ae3f2dba9e7a6f91b4e Merge: ac7df7f 8a74291 Author: Isis Lovecruft Date: Mon May 21 18:59:51 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Print fingerprints in hex thank you very much.

2018-05-21 Thread isis
commit ac7df7fdc00464585f9220dc4bfbc675c57fd2d0 Author: Isis Lovecruft Date: Mon May 21 18:58:52 2018 + Print fingerprints in hex thank you very much. --- bridgedb/Bridges.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridgedb/Bridges.py b/bridgedb

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.7'

2018-05-21 Thread isis
commit 8a74291b8f7e76782a7c0cb3f94569d5686f5d2b Merge: e6ac1cc ac7df7f Author: Isis Lovecruft Date: Mon May 21 18:59:45 2018 + Merge branch 'release/0.6.7' bridgedb/Bridges.py | 3 ++- 1 file changed, 2 insertions(+),

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.7'

2018-05-21 Thread isis
commit 8a74291b8f7e76782a7c0cb3f94569d5686f5d2b Merge: e6ac1cc ac7df7f Author: Isis Lovecruft Date: Mon May 21 18:59:45 2018 + Merge branch 'release/0.6.7' bridgedb/Bridges.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) _

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2018-05-21 Thread isis
commit 2ec54aa253da7969166e7f4c4253a34b8dea833d Merge: 2a4ba64 e6ac1cc Author: Isis Lovecruft Date: Mon May 21 18:51:56 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/develop] Print fingerprints in hex thank you very much.

2018-05-21 Thread isis
commit ac7df7fdc00464585f9220dc4bfbc675c57fd2d0 Author: Isis Lovecruft Date: Mon May 21 18:58:52 2018 + Print fingerprints in hex thank you very much. --- bridgedb/Bridges.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridgedb/Bridges.py b/bridgedb

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2018-05-21 Thread isis
commit 2ec54aa253da7969166e7f4c4253a34b8dea833d Merge: 2a4ba64 e6ac1cc Author: Isis Lovecruft Date: Mon May 21 18:51:56 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.6'

2018-05-21 Thread isis
commit e6ac1ccaec294bf80ffc0694839ca562dd515d75 Merge: 9cfb469 2a4ba64 Author: Isis Lovecruft Date: Mon May 21 18:42:49 2018 + Merge branch 'release/0.6.6' bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) ___ t

[tor-commits] [bridgedb/master] Merge branch 'bug26150' into develop

2018-05-21 Thread isis
commit 2a4ba64a3d0c3f108c2fa25142edfcc3148d98e2 Merge: 85e4566 6db4d2b Author: Isis Lovecruft Date: Mon May 21 18:41:54 2018 + Merge branch 'bug26150' into develop bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) _

[tor-commits] [bridgedb/develop] Hotfix for strange bridges missing address fields.

2018-05-21 Thread isis
commit 6db4d2beccab230bd40fb423da48ac2f336a5662 Author: Isis Lovecruft Date: Mon May 21 18:27:28 2018 + Hotfix for strange bridges missing address fields. --- bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index

[tor-commits] [bridgedb/master] Hotfix for strange bridges missing address fields.

2018-05-21 Thread isis
commit 6db4d2beccab230bd40fb423da48ac2f336a5662 Author: Isis Lovecruft Date: Mon May 21 18:27:28 2018 + Hotfix for strange bridges missing address fields. --- bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index

[tor-commits] [bridgedb/develop] Merge branch 'bug26150' into develop

2018-05-21 Thread isis
commit 2a4ba64a3d0c3f108c2fa25142edfcc3148d98e2 Merge: 85e4566 6db4d2b Author: Isis Lovecruft Date: Mon May 21 18:41:54 2018 + Merge branch 'bug26150' into develop bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) _

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2018-05-21 Thread isis
commit 85e45669568d82a0c238227fe2c5d2478ff15676 Merge: d9741cf 9cfb469 Author: Isis Lovecruft Date: Fri May 4 18:29:41 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.6'

2018-05-21 Thread isis
commit e6ac1ccaec294bf80ffc0694839ca562dd515d75 Merge: 9cfb469 2a4ba64 Author: Isis Lovecruft Date: Mon May 21 18:42:49 2018 + Merge branch 'release/0.6.6' bridgedb/Bridges.py | 7 +++ 1 file changed, 7 insertions(+) ___ t

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2018-05-04 Thread isis
commit c970e64636be52adfcd10db58549859ff6592313 Merge: 4faecd5 54c6629 Author: Isis Lovecruft Date: Tue Feb 13 22:24:33 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Merge branch 'fix/26023' into develop

2018-05-04 Thread isis
commit d9741cf7e04f2571a4fcd82877a4fb84232eb941 Merge: 37e126f 35772f8 Author: Isis Lovecruft Date: Fri May 4 18:25:37 2018 + Merge branch 'fix/26023' into develop bridgedb/parse/descriptors.py | 14 +- 1 file changed, 13 insertions(+),

[tor-commits] [bridgedb/master] Add script for assigning unallocated bridges to another distributor.

2018-05-04 Thread isis
commit 3095c905600431cc3c0f52885cc8ad219228fafe Author: Isis Lovecruft Date: Wed Feb 14 00:25:48 2018 + Add script for assigning unallocated bridges to another distributor. * FIXES #25246: https://bugs.torproject.org/25246 --- scripts/assign-reserve-bridges.py | 81

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.5'

2018-05-04 Thread isis
commit 9cfb4690b4a2f6d88542a275af2e387955c2113c Merge: 54c6629 d9741cf Author: Isis Lovecruft Date: Fri May 4 18:29:25 2018 + Merge branch 'release/0.6.5' bridgedb/parse/descriptors.py | 14 ++- scripts/assign-reserve-bridges.py | 81

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.5'

2018-05-04 Thread isis
commit 9cfb4690b4a2f6d88542a275af2e387955c2113c Merge: 54c6629 d9741cf Author: Isis Lovecruft Date: Fri May 4 18:29:25 2018 + Merge branch 'release/0.6.5' bridgedb/parse/descriptors.py | 14 ++- scripts/assign-reserve-bridges.py | 81

[tor-commits] [bridgedb/master] Merge branch 'feature/25246' into develop

2018-05-04 Thread isis
commit 37e126f3768c2d6a6295b782fff4ea75b90e895f Merge: c970e64 3095c90 Author: Isis Lovecruft Date: Wed Feb 14 00:29:35 2018 + Merge branch 'feature/25246' into develop scripts/assign-reserve-bridges.py | 81 +++ 1 file changed, 81

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2018-05-04 Thread isis
commit 85e45669568d82a0c238227fe2c5d2478ff15676 Merge: d9741cf 9cfb469 Author: Isis Lovecruft Date: Fri May 4 18:29:41 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Workaround for datetime exception in Stem for weird ed25519 certs.

2018-05-04 Thread isis
commit 35772f8bca656f8ced14082c6e00b36345cd0332 Author: Isis Lovecruft Date: Fri May 4 18:20:22 2018 + Workaround for datetime exception in Stem for weird ed25519 certs. There's few bridges whose ed25519 certificates contain the year 491869, which the datetime m

[tor-commits] [bridgedb/develop] Merge branch 'fix/26023' into develop

2018-05-04 Thread isis
commit d9741cf7e04f2571a4fcd82877a4fb84232eb941 Merge: 37e126f 35772f8 Author: Isis Lovecruft Date: Fri May 4 18:25:37 2018 + Merge branch 'fix/26023' into develop bridgedb/parse/descriptors.py | 14 +- 1 file changed, 13 insertions(+),

[tor-commits] [bridgedb/develop] Workaround for datetime exception in Stem for weird ed25519 certs.

2018-05-04 Thread isis
commit 35772f8bca656f8ced14082c6e00b36345cd0332 Author: Isis Lovecruft Date: Fri May 4 18:20:22 2018 + Workaround for datetime exception in Stem for weird ed25519 certs. There's few bridges whose ed25519 certificates contain the year 491869, which the datetime m

[tor-commits] [bridgedb/develop] Merge branch 'feature/25246' into develop

2018-02-13 Thread isis
commit 37e126f3768c2d6a6295b782fff4ea75b90e895f Merge: c970e64 3095c90 Author: Isis Lovecruft Date: Wed Feb 14 00:29:35 2018 + Merge branch 'feature/25246' into develop scripts/assign-reserve-bridges.py | 81 +++ 1 file changed, 81

[tor-commits] [bridgedb/develop] Add script for assigning unallocated bridges to another distributor.

2018-02-13 Thread isis
commit 3095c905600431cc3c0f52885cc8ad219228fafe Author: Isis Lovecruft Date: Wed Feb 14 00:25:48 2018 + Add script for assigning unallocated bridges to another distributor. * FIXES #25246: https://bugs.torproject.org/25246 --- scripts/assign-reserve-bridges.py | 81

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2018-02-13 Thread isis
commit 30e11ff6e5ba13f9509dfe217ff68fa46427212a Merge: bc61afb d49e904 Author: Isis Lovecruft Date: Tue Jan 23 21:42:01 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.4'

2018-02-13 Thread isis
commit 54c662947fb86330ef4a160a0e9fe2c707bd560c Merge: d49e904 4faecd5 Author: Isis Lovecruft Date: Tue Feb 13 22:24:25 2018 + Merge branch 'release/0.6.4' bridgedb.conf | 5 +++ bridgedb/distributors/common/http.py

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.4'

2018-02-13 Thread isis
commit 54c662947fb86330ef4a160a0e9fe2c707bd560c Merge: d49e904 4faecd5 Author: Isis Lovecruft Date: Tue Feb 13 22:24:25 2018 + Merge branch 'release/0.6.4' bridgedb.conf | 5 +++ bridgedb/distributors/common/http.py

[tor-commits] [bridgedb/master] Add config option to skip loopback addresses in X-Forwarded-For parsing.

2018-02-13 Thread isis
commit bf7ec9eeb61908bd3bc39efc68281638504cd3cf Author: Isis Lovecruft Date: Tue Feb 13 21:11:21 2018 + Add config option to skip loopback addresses in X-Forwarded-For parsing. --- bridgedb.conf | 5 bridgedb/distributors/common/http.py

[tor-commits] [bridgedb/master] Merge branch 'fix/24432-ignore-loopback' into develop

2018-02-13 Thread isis
commit 4faecd5c7252d108e3749a63ab0f0a0464adec05 Merge: 8b4f736 bf7ec9e Author: Isis Lovecruft Date: Tue Feb 13 22:20:51 2018 + Merge branch 'fix/24432-ignore-loopback' into develop bridgedb.conf | 5 bridgedb/distributors/comm

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2018-02-13 Thread isis
commit c970e64636be52adfcd10db58549859ff6592313 Merge: 4faecd5 54c6629 Author: Isis Lovecruft Date: Tue Feb 13 22:24:33 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] The JSON data coming into moat is being processed as a str.

2018-02-13 Thread isis
commit 8b4f7367e82636701997acbb57ae463c4471e3c4 Author: Isis Lovecruft Date: Tue Feb 13 20:02:47 2018 + The JSON data coming into moat is being processed as a str. Duck-typing is why we can't have nice things. --- bridgedb/distributors/moat/server.py

[tor-commits] [bridgedb/develop] Merge branch 'fix/24432-ignore-loopback' into develop

2018-02-13 Thread isis
commit 4faecd5c7252d108e3749a63ab0f0a0464adec05 Merge: 8b4f736 bf7ec9e Author: Isis Lovecruft Date: Tue Feb 13 22:20:51 2018 + Merge branch 'fix/24432-ignore-loopback' into develop bridgedb.conf | 5 bridgedb/distributors/comm

[tor-commits] [bridgedb/develop] The JSON data coming into moat is being processed as a str.

2018-02-13 Thread isis
commit 8b4f7367e82636701997acbb57ae463c4471e3c4 Author: Isis Lovecruft Date: Tue Feb 13 20:02:47 2018 + The JSON data coming into moat is being processed as a str. Duck-typing is why we can't have nice things. --- bridgedb/distributors/moat/server.py

[tor-commits] [bridgedb/develop] Add config option to skip loopback addresses in X-Forwarded-For parsing.

2018-02-13 Thread isis
commit bf7ec9eeb61908bd3bc39efc68281638504cd3cf Author: Isis Lovecruft Date: Tue Feb 13 21:11:21 2018 + Add config option to skip loopback addresses in X-Forwarded-For parsing. --- bridgedb.conf | 5 bridgedb/distributors/common/http.py

[tor-commits] [bridgedb/master] Add more unittests for legacy code in Bridges.py.

2018-01-23 Thread isis
commit 8aedf0b81874d828c85470a5ef36dbce8324d291 Author: Isis Lovecruft Date: Fri Dec 22 03:18:06 2017 + Add more unittests for legacy code in Bridges.py. --- bridgedb/test/test_Bridges.py | 95 ++- 1 file changed, 93 insertions(+), 2 deletions

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2018-01-23 Thread isis
commit 05ca3dbd35a392e8661c7288dc42c99a3443b110 Merge: 6ace9a3 2ae288d Author: Isis Lovecruft Date: Wed Dec 20 23:07:24 2017 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Delay and then redirect malicious requests.

2018-01-23 Thread isis
commit 0f03fb65518353e1409e08def7201ea17fe1318f Author: Isis Lovecruft Date: Fri Dec 22 01:45:52 2017 + Delay and then redirect malicious requests. * FIXES #24701: https://bugs.torproject.org/24701 --- bridgedb/distributors/https/server.py | 43

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.3'

2018-01-23 Thread isis
commit d49e90455c1fd6d66d057b0ba6e6ee4f23129b9f Merge: 2ae288d bc61afb Author: Isis Lovecruft Date: Tue Jan 23 21:41:55 2018 + Merge branch 'release/0.6.3' CHANGELOG | 44 bridgedb/Bridges.py| 52 --

[tor-commits] [bridgedb/master] Fix problem with "missing resources" on production moat server.

2018-01-23 Thread isis
commit 19c111cdabd70c3c69933e09b8efe06bb679d844 Author: Isis Lovecruft Date: Tue Jan 23 21:03:35 2018 + Fix problem with "missing resources" on production moat server. * FIXES #24432 https://bugs.torproject.org/24432. --- bridgedb/distributors/moat/server.py | 1

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2018-01-23 Thread isis
commit 30e11ff6e5ba13f9509dfe217ff68fa46427212a Merge: bc61afb d49e904 Author: Isis Lovecruft Date: Tue Jan 23 21:42:01 2018 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Modify scripts/test-moat to also test production through a meek tunnel.

2018-01-23 Thread isis
commit 247d425ed8526eb9b0319e644c340deb3faa49e4 Author: Isis Lovecruft Date: Tue Nov 28 02:03:07 2017 + Modify scripts/test-moat to also test production through a meek tunnel. --- scripts/test-moat | 49 +++-- 1 file changed, 39 insertions

[tor-commits] [bridgedb/master] Filter returned bridges to avoid multiples from the same /16 or /32.

2018-01-23 Thread isis
commit ad269657fe16f2603f207bdb2a979266c3b918e8 Author: Isis Lovecruft Date: Fri Dec 22 02:34:32 2017 + Filter returned bridges to avoid multiples from the same /16 or /32. * FIXES #24704 https://bugs.torproject.org/24704 --- bridgedb/Bridges.py| 52

[tor-commits] [bridgedb/master] Merge branch 'fix/24701' into develop

2018-01-23 Thread isis
commit c6c9f47968368f987dd0b9edefdf55ea4f0b1ad2 Merge: 637e1fc 0f03fb6 Author: Isis Lovecruft Date: Fri Dec 22 03:20:32 2017 + Merge branch 'fix/24701' into develop bridgedb/distributors/https/server.py | 43 +++ bridgedb/test/test_https

[tor-commits] [bridgedb/develop] Fix problem with "missing resources" on production moat server.

2018-01-23 Thread isis
commit 19c111cdabd70c3c69933e09b8efe06bb679d844 Author: Isis Lovecruft Date: Tue Jan 23 21:03:35 2018 + Fix problem with "missing resources" on production moat server. * FIXES #24432 https://bugs.torproject.org/24432. --- bridgedb/distributors/moat/server.py | 1

[tor-commits] [bridgedb/master] Merge branch 'fix/24432' into develop

2018-01-23 Thread isis
commit 3a5dce31dc43f1ea7292e67372b57385ab5a4788 Merge: 94327eb 19c111c Author: Isis Lovecruft Date: Tue Jan 23 21:05:21 2018 + Merge branch 'fix/24432' into develop bridgedb/distributors/moat/server.py | 1 + scripts/externalize-pt-client| 12 + scripts

[tor-commits] [bridgedb/master] Add CHANGELOG entries for 0.6.2.

2018-01-23 Thread isis
commit 1096bf4d9ed1cbded7ce8ad2a183338f969b1166 Author: Isis Lovecruft Date: Wed Dec 20 23:22:31 2017 + Add CHANGELOG entries for 0.6.2. --- CHANGELOG | 20 1 file changed, 20 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index effc405..82cf769 100644 --- a

[tor-commits] [bridgedb/master] Merge branch 'fix/24704' into develop

2018-01-23 Thread isis
commit 637e1fc2a4e09ec8ad5a2442db2298d3666897eb Merge: 1096bf4 ad26965 Author: Isis Lovecruft Date: Fri Dec 22 02:41:46 2017 + Merge branch 'fix/24704' into develop bridgedb/Bridges.py| 52 bridgedb/distributors/email/dist

[tor-commits] [bridgedb/master] Add David's script for running an external meek client.

2018-01-23 Thread isis
commit 2783933bf9935b6a7ab4ce97386887865a45589a Author: David Fifield Date: Tue Nov 28 02:05:58 2017 + Add David's script for running an external meek client. --- scripts/externalize-pt-client | 12 1 file changed, 12 insertions(+) diff --git a/scripts/externalize-pt-clie

[tor-commits] [bridgedb/develop] Create CHANGELOG entry for 0.6.3.

2018-01-23 Thread isis
commit bc61afb1ec44f402a86c670d99e749164b5f3f3e Author: Isis Lovecruft Date: Tue Jan 23 21:40:33 2018 + Create CHANGELOG entry for 0.6.3. --- CHANGELOG | 24 1 file changed, 24 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 82cf769..9ffeac1 100644

[tor-commits] [bridgedb/develop] Add David's script for running an external meek client.

2018-01-23 Thread isis
commit 2783933bf9935b6a7ab4ce97386887865a45589a Author: David Fifield Date: Tue Nov 28 02:05:58 2017 + Add David's script for running an external meek client. --- scripts/externalize-pt-client | 12 1 file changed, 12 insertions(+) diff --git a/scripts/externalize-pt-clie

[tor-commits] [bridgedb/master] Create CHANGELOG entry for 0.6.3.

2018-01-23 Thread isis
commit bc61afb1ec44f402a86c670d99e749164b5f3f3e Author: Isis Lovecruft Date: Tue Jan 23 21:40:33 2018 + Create CHANGELOG entry for 0.6.3. --- CHANGELOG | 24 1 file changed, 24 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 82cf769..9ffeac1 100644

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.3'

2018-01-23 Thread isis
commit d49e90455c1fd6d66d057b0ba6e6ee4f23129b9f Merge: 2ae288d bc61afb Author: Isis Lovecruft Date: Tue Jan 23 21:41:55 2018 + Merge branch 'release/0.6.3' CHANGELOG | 44 bridgedb/Bridges.py| 52 --

[tor-commits] [bridgedb/master] Merge branch 'fix/24704' into develop

2018-01-23 Thread isis
commit 94327eb3eca56785f865483d1ccdf4aa6e03752e Merge: c6c9f47 8aedf0b Author: Isis Lovecruft Date: Tue Jan 23 02:02:09 2018 + Merge branch 'fix/24704' into develop bridgedb/test/test_Bridges.py | 95 ++- 1 file changed, 93 insert

[tor-commits] [bridgedb/develop] Merge branch 'fix/24432' into develop

2018-01-23 Thread isis
commit 3a5dce31dc43f1ea7292e67372b57385ab5a4788 Merge: 94327eb 19c111c Author: Isis Lovecruft Date: Tue Jan 23 21:05:21 2018 + Merge branch 'fix/24432' into develop bridgedb/distributors/moat/server.py | 1 + scripts/externalize-pt-client| 12 + scripts

[tor-commits] [bridgedb/develop] Modify scripts/test-moat to also test production through a meek tunnel.

2018-01-23 Thread isis
commit 247d425ed8526eb9b0319e644c340deb3faa49e4 Author: Isis Lovecruft Date: Tue Nov 28 02:03:07 2017 + Modify scripts/test-moat to also test production through a meek tunnel. --- scripts/test-moat | 49 +++-- 1 file changed, 39 insertions

[tor-commits] [bridgedb/develop] Add more unittests for legacy code in Bridges.py.

2018-01-23 Thread isis
commit 8aedf0b81874d828c85470a5ef36dbce8324d291 Author: Isis Lovecruft Date: Fri Dec 22 03:18:06 2017 + Add more unittests for legacy code in Bridges.py. --- bridgedb/test/test_Bridges.py | 95 ++- 1 file changed, 93 insertions(+), 2 deletions

[tor-commits] [bridgedb/develop] Merge branch 'fix/24704' into develop

2018-01-23 Thread isis
commit 94327eb3eca56785f865483d1ccdf4aa6e03752e Merge: c6c9f47 8aedf0b Author: Isis Lovecruft Date: Tue Jan 23 02:02:09 2018 + Merge branch 'fix/24704' into develop bridgedb/test/test_Bridges.py | 95 ++- 1 file changed, 93 insert

[tor-commits] [bridgedb/develop] Merge branch 'fix/24701' into develop

2017-12-21 Thread isis
commit c6c9f47968368f987dd0b9edefdf55ea4f0b1ad2 Merge: 637e1fc 0f03fb6 Author: Isis Lovecruft Date: Fri Dec 22 03:20:32 2017 + Merge branch 'fix/24701' into develop bridgedb/distributors/https/server.py | 43 +++ bridgedb/test/test_https

[tor-commits] [bridgedb/develop] Delay and then redirect malicious requests.

2017-12-21 Thread isis
commit 0f03fb65518353e1409e08def7201ea17fe1318f Author: Isis Lovecruft Date: Fri Dec 22 01:45:52 2017 + Delay and then redirect malicious requests. * FIXES #24701: https://bugs.torproject.org/24701 --- bridgedb/distributors/https/server.py | 43

[tor-commits] [bridgedb/develop] Merge branch 'fix/24704' into develop

2017-12-21 Thread isis
commit 637e1fc2a4e09ec8ad5a2442db2298d3666897eb Merge: 1096bf4 ad26965 Author: Isis Lovecruft Date: Fri Dec 22 02:41:46 2017 + Merge branch 'fix/24704' into develop bridgedb/Bridges.py| 52 bridgedb/distributors/email/dist

[tor-commits] [bridgedb/develop] Filter returned bridges to avoid multiples from the same /16 or /32.

2017-12-21 Thread isis
commit ad269657fe16f2603f207bdb2a979266c3b918e8 Author: Isis Lovecruft Date: Fri Dec 22 02:34:32 2017 + Filter returned bridges to avoid multiples from the same /16 or /32. * FIXES #24704 https://bugs.torproject.org/24704 --- bridgedb/Bridges.py| 52

[tor-commits] [bridgedb/develop] Add CHANGELOG entries for 0.6.2.

2017-12-20 Thread isis
commit 1096bf4d9ed1cbded7ce8ad2a183338f969b1166 Author: Isis Lovecruft Date: Wed Dec 20 23:22:31 2017 + Add CHANGELOG entries for 0.6.2. --- CHANGELOG | 20 1 file changed, 20 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index effc405..82cf769 100644 --- a

[tor-commits] [bridgedb/master] Implement moat error handling when no bridges are available.

2017-12-20 Thread isis
commit 4c799735b5b86beea486ee3b1cd0ea8a4f5cb4b5 Author: Isis Lovecruft Date: Wed Dec 20 22:36:06 2017 + Implement moat error handling when no bridges are available. * FIXES #24637: https://bugs.torproject.org/24637 --- bridgedb/distributors/moat/server.py | 73

[tor-commits] [bridgedb/master] Revert "Change "client-transport" moat resource type to "moat-transports"."

2017-12-20 Thread isis
commit 6aaa2ed270e432efddd7cdc9ea81b83c00fe9c75 Author: Isis Lovecruft Date: Wed Dec 13 20:10:32 2017 + Revert "Change "client-transport" moat resource type to "moat-transports"." This reverts commit 50a9321fadcfd0e9a4f30bc1919c1bf46d27d8e1. -

[tor-commits] [bridgedb/master] Change "client-transport" moat resource type to "moat-transports".

2017-12-20 Thread isis
commit 50a9321fadcfd0e9a4f30bc1919c1bf46d27d8e1 Author: Isis Lovecruft Date: Wed Dec 13 18:24:04 2017 + Change "client-transport" moat resource type to "moat-transports". --- bridgedb/distributors/moat/server.py | 14 +++--- 1 file changed, 7 insert

[tor-commits] [bridgedb/master] Add a human-readable __str__() method to BridgeRequest classes.

2017-12-20 Thread isis
commit f37c22c6284f13fb9f26f78926f0d115b468fb71 Author: Isis Lovecruft Date: Wed Dec 20 21:38:12 2017 + Add a human-readable __str__() method to BridgeRequest classes. --- bridgedb/bridgerequest.py | 9 + 1 file changed, 9 insertions(+) diff --git a/bridgedb/bridgerequest.py

[tor-commits] [bridgedb/master] Merge branch 'fix/24636' into develop

2017-12-20 Thread isis
commit 91305fa523c8b9e6a631d8c29f583e3da722832e Merge: 9a926f2 da84c25 Author: Isis Lovecruft Date: Wed Dec 20 22:59:11 2017 + Merge branch 'fix/24636' into develop README.rst | 25 ++--- 1 file changed, 14 insertions(+), 11

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.2'

2017-12-20 Thread isis
commit 2ae288d6f7e3051b3aa3c85e9a8341c3e21baf4b Merge: 9bb5de6 6ace9a3 Author: Isis Lovecruft Date: Wed Dec 20 23:07:12 2017 + Merge branch 'release/0.6.2' README.rst | 34 ++-- bridgedb/bridgerequest.py

[tor-commits] [bridgedb/master] Merge branch 'release/0.6.1'

2017-12-20 Thread isis
commit 9bb5de6b07d33bef6ca7db22a70398018523b6e4 Merge: 659b4ed 6aaa2ed Author: Isis Lovecruft Date: Wed Dec 13 20:12:08 2017 + Merge branch 'release/0.6.1' CHANGELOG | 53 + README.rst

[tor-commits] [bridgedb/master] Clarify the specified moat error if there are no bridges.

2017-12-20 Thread isis
commit b0898951e8c1b9a4b3d615e9d9422d5c4ce67576 Author: Isis Lovecruft Date: Wed Dec 20 21:36:18 2017 + Clarify the specified moat error if there are no bridges. --- README.rst | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index

[tor-commits] [bridgedb/master] Merge branch 'fix/24637' into develop

2017-12-20 Thread isis
commit 6ace9a350f5f700d9f1f6ff88c6a275c1fb18414 Merge: 91305fa 4c79973 Author: Isis Lovecruft Date: Wed Dec 20 22:59:15 2017 + Merge branch 'fix/24637' into develop README.rst | 9 ++-- bridgedb/bridgerequest.py

[tor-commits] [bridgedb/master] Change moat API specification to remove "moat-transports" response.

2017-12-20 Thread isis
commit da84c257cc600a1aeb6bafb70bd3fc0878ed212f Author: Isis Lovecruft Date: Wed Dec 20 22:51:38 2017 + Change moat API specification to remove "moat-transports" response. * FIXES #24636: https://bugs.torproject.org/24636 --- README.rst | 25 ++-

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2017-12-20 Thread isis
commit 9a926f28de7af283558bf2688d5fa642d059c678 Merge: b828d57 9bb5de6 Author: Isis Lovecruft Date: Wed Dec 13 20:12:17 2017 + Merge branch 'master' into develop bridgedb/distributors/moat/server.py | 14 +++--- 1 file changed, 7 insertions(+), 7

[tor-commits] [bridgedb/master] Merge branch 'fix/24460' into develop

2017-12-20 Thread isis
commit 16e7a2d5fad1658244c204bdfb54e5e385e4632f Merge: a316083 6de Author: Isis Lovecruft Date: Tue Nov 28 19:44:42 2017 + Merge branch 'fix/24460' into develop bridgedb/distributors/https/server.py | 6 -- bridgedb/test/test_https_server.py| 14 +

[tor-commits] [bridgedb/master] Fix quoting in moat specification.

2017-12-20 Thread isis
commit 8d8db4a06d3dff5e9f82adcb4e0e921fe3577098 Author: Isis Lovecruft Date: Wed Dec 13 18:18:55 2017 + Fix quoting in moat specification. --- README.rst | 74 +++--- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git

[tor-commits] [bridgedb/master] Add CHANGELOG entries for 0.6.1.

2017-12-20 Thread isis
commit b828d5777f02dc6f544a0ea821952dc1f06e2d7d Author: Isis Lovecruft Date: Wed Dec 13 18:55:50 2017 + Add CHANGELOG entries for 0.6.1. --- CHANGELOG | 53 + 1 file changed, 53 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index

[tor-commits] [bridgedb/master] Merge branch 'fix/3015-remove-buckets' into develop

2017-12-20 Thread isis
commit e3a2ea593dcc6614b865572d9fc1d3b333b5770d Merge: 16e7a2d f4d5591 Author: Isis Lovecruft Date: Tue Nov 28 21:22:24 2017 + Merge branch 'fix/3015-remove-buckets' into develop README.rst| 23 +-- bridgedb.conf | 6 -

[tor-commits] [bridgedb/master] Fix the moat server to only generate QRcodes when asked to do so.

2017-12-20 Thread isis
commit 039884c4f19bb3f52b076e1bc5901800b5258fe1 Author: Isis Lovecruft Date: Mon Nov 27 23:22:33 2017 + Fix the moat server to only generate QRcodes when asked to do so. * FIXES #24443: https://bugs.torproject.org/24443 --- bridgedb/distributors/moat/server.py | 2 +- 1 file

[tor-commits] [bridgedb/develop] Merge branch 'fix/24636' into develop

2017-12-20 Thread isis
commit 91305fa523c8b9e6a631d8c29f583e3da722832e Merge: 9a926f2 da84c25 Author: Isis Lovecruft Date: Wed Dec 20 22:59:11 2017 + Merge branch 'fix/24636' into develop README.rst | 25 ++--- 1 file changed, 14 insertions(+), 11

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2017-12-20 Thread isis
commit bbd40684b566faafdc87255d5358deca8a1aeb38 Merge: b4d32c7 659b4ed Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Make the test-moat script easier to input challenges and solutions.

2017-12-20 Thread isis
commit 8245b6a2c4f4697a33b1c169529aed66b6e1a55a Author: Isis Lovecruft Date: Mon Nov 27 19:13:54 2017 + Make the test-moat script easier to input challenges and solutions. --- scripts/test-moat | 26 ++ 1 file changed, 22 insertions(+), 4 deletions(-) diff

[tor-commits] [bridgedb/master] Merge branch 'fix/24443' into develop

2017-12-20 Thread isis
commit cb3f4b4aa27b527bfb000cc254d08622b90a526e Merge: 76d3c5b 039884c Author: Isis Lovecruft Date: Mon Nov 27 23:26:17 2017 + Merge branch 'fix/24443' into develop bridgedb/distributors/moat/server.py | 2 +- 1 file changed, 1 insertion(+),

[tor-commits] [bridgedb/master] Remove unused bucket functionality.

2017-12-20 Thread isis
commit f4d559197e06bc4b2e783634d6e79232a440025f Author: Isis Lovecruft Date: Mon Nov 20 23:13:47 2017 + Remove unused bucket functionality. * CLOSES #3015: https://bugs.torproject.org/3015 --- README.rst| 23 +-- bridgedb.conf

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2017-12-20 Thread isis
commit 9a926f28de7af283558bf2688d5fa642d059c678 Merge: b828d57 9bb5de6 Author: Isis Lovecruft Date: Wed Dec 13 20:12:17 2017 + Merge branch 'master' into develop bridgedb/distributors/moat/server.py | 14 +++--- 1 file changed, 7 insertions(+), 7

[tor-commits] [bridgedb/develop] Implement moat error handling when no bridges are available.

2017-12-20 Thread isis
commit 4c799735b5b86beea486ee3b1cd0ea8a4f5cb4b5 Author: Isis Lovecruft Date: Wed Dec 20 22:36:06 2017 + Implement moat error handling when no bridges are available. * FIXES #24637: https://bugs.torproject.org/24637 --- bridgedb/distributors/moat/server.py | 73

[tor-commits] [bridgedb/master] Merge branch 'fix/24433' into develop

2017-12-20 Thread isis
commit 76d3c5bca779c78236a8dffb389304412e97af5e Merge: 8245b6a a1597da Author: Isis Lovecruft Date: Mon Nov 27 19:38:27 2017 + Merge branch 'fix/24433' into develop bridgedb/bridgerequest.py | 2 +- scripts/test-moat | 2 ++ 2 files changed, 3 insertions(+),

[tor-commits] [bridgedb/develop] Clarify the specified moat error if there are no bridges.

2017-12-20 Thread isis
commit b0898951e8c1b9a4b3d615e9d9422d5c4ce67576 Author: Isis Lovecruft Date: Wed Dec 20 21:36:18 2017 + Clarify the specified moat error if there are no bridges. --- README.rst | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index

[tor-commits] [bridgedb/master] Add script for using curl to test moat's JSON API.

2017-12-20 Thread isis
commit 0c24fa3719aa29e967ca5804e8eaaab80af17e32 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Add script for using curl to test moat's JSON API. --- scripts/test-moat | 36 1 file changed, 36 insertions(+) diff --git a/scripts/test

[tor-commits] [bridgedb/develop] Merge branch 'release/0.6.2'

2017-12-20 Thread isis
commit 2ae288d6f7e3051b3aa3c85e9a8341c3e21baf4b Merge: 9bb5de6 6ace9a3 Author: Isis Lovecruft Date: Wed Dec 20 23:07:12 2017 + Merge branch 'release/0.6.2' README.rst | 34 ++-- bridgedb/bridgerequest.py

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2017-12-20 Thread isis
commit 05ca3dbd35a392e8661c7288dc42c99a3443b110 Merge: 6ace9a3 2ae288d Author: Isis Lovecruft Date: Wed Dec 20 23:07:24 2017 + Merge branch 'master' into develop ___ tor-commits mailing list tor-commits@lists.torproject

[tor-commits] [bridgedb/master] Fix error in usage of redirectTo() with a malicious request.

2017-12-20 Thread isis
commit 6deaad380d9a48524c69533bf566a7a1406b Author: Isis Lovecruft Date: Tue Nov 28 19:43:10 2017 + Fix error in usage of redirectTo() with a malicious request. * FIXES #24460: https://bugs.torproject.org/24460 --- bridgedb/distributors/https/server.py | 6

[tor-commits] [bridgedb/develop] Merge branch 'fix/24637' into develop

2017-12-20 Thread isis
commit 6ace9a350f5f700d9f1f6ff88c6a275c1fb18414 Merge: 91305fa 4c79973 Author: Isis Lovecruft Date: Wed Dec 20 22:59:15 2017 + Merge branch 'fix/24637' into develop README.rst | 9 ++-- bridgedb/bridgerequest.py

[tor-commits] [bridgedb/master] Fix failing unittest after #24433 merge.

2017-12-20 Thread isis
commit a316083e1a3a9eedcc6aa5d27c053f4974f8cf39 Author: Isis Lovecruft Date: Tue Nov 28 02:33:05 2017 + Fix failing unittest after #24433 merge. --- bridgedb/test/test_distributors_moat_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/test

[tor-commits] [bridgedb/develop] Change moat API specification to remove "moat-transports" response.

2017-12-20 Thread isis
commit da84c257cc600a1aeb6bafb70bd3fc0878ed212f Author: Isis Lovecruft Date: Wed Dec 20 22:51:38 2017 + Change moat API specification to remove "moat-transports" response. * FIXES #24636: https://bugs.torproject.org/24636 --- README.rst | 25 ++-

[tor-commits] [bridgedb/develop] Remove unused bucket functionality.

2017-12-20 Thread isis
commit f4d559197e06bc4b2e783634d6e79232a440025f Author: Isis Lovecruft Date: Mon Nov 20 23:13:47 2017 + Remove unused bucket functionality. * CLOSES #3015: https://bugs.torproject.org/3015 --- README.rst| 23 +-- bridgedb.conf

  1   2   3   4   5   6   7   8   9   10   >