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

2017-11-15 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-moat b

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

2017-11-15 Thread isis
commit dda4bbee3c57314b16861304b1490b07b8caed7a Merge: 3560339 3667a63 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Merge branch 'fix/22871_r1' into develop .coveragerc | 1 + README.rst | 173 +

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

2017-11-15 Thread isis
commit 659b4ed3bfea6318ac0d3fb3bad99b44af89 Merge: 513cd25 b4d32c7 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Merge branch 'release/0.6.0' .coveragerc| 2 + .travis.requirements.txt | 2 +- CHANGELO

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

2017-11-15 Thread isis
commit b4d32c71285dcf6f37561476c4c86aebf495d549 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Add CHANGELOG entries for BridgeDB 0.6.0. --- CHANGELOG | 12 1 file changed, 12 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 316e45d..7dbe222 100644 --- a/CH

[tor-commits] [bridgedb/master] Fix Sphinx documentation to build with newer dependencies.

2017-11-15 Thread isis
commit 5ed3e53ebaf103dc0693e61825b1d5333730aa98 Author: Isis Lovecruft Date: Thu Nov 2 01:22:30 2017 + Fix Sphinx documentation to build with newer dependencies. --- doc/sphinx/source/bridgedb.distributors.email.rst | 15 +++ doc/sphinx/source/bridgedb.distributors.https.rs

[tor-commits] [bridgedb/master] Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile().

2017-11-15 Thread isis
commit 0b68b8223ebec20e3bd6bdff0d3752509dadb337 Author: Isis Lovecruft Date: Thu Nov 2 01:02:41 2017 + Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile(). --- bridgedb/parse/blacklist.py | 12 +++- bridgedb/test/test_parse_blacklist.py | 56

[tor-commits] [bridgedb/master] Add more tests for bridgedb.main.

2017-11-15 Thread isis
commit 00a9288a141158552ee56790211ed230704775d7 Author: Isis Lovecruft Date: Thu Nov 2 00:27:31 2017 + Add more tests for bridgedb.main. --- bridgedb/main.py | 4 ++-- bridgedb/test/test_main.py | 23 +++ 2 files changed, 25 insertions(+), 2 deletions(-)

[tor-commits] [bridgedb/master] Specify the moat API.

2017-11-15 Thread isis
commit 9d452247e4378a44e46fb31b14acf2238e4d9dd6 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Specify the moat API. * FIXES part of https://bugs.torproject.org/22871 --- README.rst | 173 + 1 file changed,

[tor-commits] [bridgedb/master] No matter how much we test this, coverage will never notice.

2017-11-15 Thread isis
commit 35603395dcac11e10a0088c1e902b4eca6672e44 Author: Isis Lovecruft Date: Thu Nov 2 01:24:16 2017 + No matter how much we test this, coverage will never notice. --- bridgedb/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/main.py b/bridgedb/main.

[tor-commits] [bridgedb/master] Implement moat distributor and server.

2017-11-15 Thread isis
commit 3667a63027d6d02c87ceae03a22771ee03a56e2a Author: Isis Lovecruft Date: Thu Sep 14 17:13:24 2017 + Implement moat distributor and server. * ADD a new distributor, moat, which speaks to Tor Launcher over a JSON API interface. * ADD new `bridgedb.distributors` p

[tor-commits] [bridgedb/develop] Implement moat distributor and server.

2017-11-15 Thread isis
commit 3667a63027d6d02c87ceae03a22771ee03a56e2a Author: Isis Lovecruft Date: Thu Sep 14 17:13:24 2017 + Implement moat distributor and server. * ADD a new distributor, moat, which speaks to Tor Launcher over a JSON API interface. * ADD new `bridgedb.distributors` p

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

2017-11-15 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.org https://lists.torp

[tor-commits] [bridgedb/develop] Update Babel dependency.

2017-11-15 Thread isis
commit 363ef571ced1a246f02320763bffe7be39949798 Author: Isis Lovecruft Date: Thu Nov 2 00:07:10 2017 + Update Babel dependency. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f60d817..d7713df 100644 ---

[tor-commits] [bridgedb/master] Upgrade coveralls dependency to 1.2.0.

2017-11-15 Thread isis
commit 93fc704cf3350313512df0d41d0ea7dd7b5901ac Author: Isis Lovecruft Date: Wed Nov 1 20:54:38 2017 + Upgrade coveralls dependency to 1.2.0. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements

[tor-commits] [bridgedb/master] Exclude test/ directory from coverage results.

2017-11-15 Thread isis
commit 9ac6ff9e304fbfda71a84996e78c4ada8b43fb9a Author: Isis Lovecruft Date: Wed Nov 1 23:55:15 2017 + Exclude test/ directory from coverage results. --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index d16f7e2..737310b 100644 --- a/.cover

[tor-commits] [bridgedb/master] Run scheduled tasks after server startup.

2017-11-15 Thread isis
commit 1112e2e650318c961e5eb8b4af574e9a825682b3 Author: Isis Lovecruft Date: Wed Nov 1 20:55:10 2017 + Run scheduled tasks after server startup. --- bridgedb/Main.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridgedb/Main.py b/bridgedb/Main.py index 53b70c

[tor-commits] [bridgedb/develop] Fix output of bridgedb --version.

2017-11-15 Thread isis
commit 914d0b9a158e3c210d17b84e3648a5962daa97ed Author: Isis Lovecruft Date: Wed Nov 1 20:56:23 2017 + Fix output of bridgedb --version. --- bridgedb/parse/options.py | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bridgedb/parse/options.py b/bridgedb/parse/o

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

2017-11-15 Thread isis
commit 659b4ed3bfea6318ac0d3fb3bad99b44af89 Merge: 513cd25 b4d32c7 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Merge branch 'release/0.6.0' .coveragerc| 2 + .travis.requirements.txt | 2 +- CHANGELO

[tor-commits] [bridgedb/master] Update Babel dependency.

2017-11-15 Thread isis
commit 363ef571ced1a246f02320763bffe7be39949798 Author: Isis Lovecruft Date: Thu Nov 2 00:07:10 2017 + Update Babel dependency. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f60d817..d7713df 100644 ---

[tor-commits] [bridgedb/master] Add Makefile directive for making TAGS file.

2017-11-15 Thread isis
commit 8ebc712bd0706c607fb30222cb304c258bf14d83 Author: Isis Lovecruft Date: Wed Nov 1 23:55:35 2017 + Add Makefile directive for making TAGS file. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 906ce94..428f004 100644 --- a/Makefile +++ b

[tor-commits] [bridgedb/master] Update Sphinx documentation build dependencies.

2017-11-15 Thread isis
commit de4b3e26d562ee810324ae33dff909dc7fd46758 Author: Isis Lovecruft Date: Wed Nov 1 23:56:13 2017 + Update Sphinx documentation build dependencies. --- doc/sphinx/requirements-for-sphinx-builds.txt | 11 ++- doc/sphinx/source/conf.py | 5 +++-- 2 files c

[tor-commits] [bridgedb/master] Fix bridgedb.main erroring unittests due to multi-bridgeauth code.

2017-11-15 Thread isis
commit c2ffe4f6785d846a083ffc347f13759e5d748c96 Author: Isis Lovecruft Date: Wed Nov 1 23:51:39 2017 + Fix bridgedb.main erroring unittests due to multi-bridgeauth code. --- bridgedb/main.py | 7 +- bridgedb/test/test_main.py | 53

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

2017-11-15 Thread isis
commit f23f3630321e4b98db7ef47dfb596eb06ad94abb Merge: 96707e2 513cd25 Author: Isis Lovecruft Date: Sat Oct 28 00:27:59 2017 + Merge branch 'master' into develop CHANGELOG | 19 +++ 1 file changed, 19 insertions(+) ___ tor

[tor-commits] [bridgedb/develop] Specify the moat API.

2017-11-15 Thread isis
commit 9d452247e4378a44e46fb31b14acf2238e4d9dd6 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Specify the moat API. * FIXES part of https://bugs.torproject.org/22871 --- README.rst | 173 + 1 file changed,

[tor-commits] [bridgedb/master] Make new bridgedb.distributors package and put distributor code there.

2017-11-15 Thread isis
commit fca25fc8d9295ab50cb2a1be39199c213ddf8751 Author: Isis Lovecruft Date: Wed Nov 1 20:44:24 2017 + Make new bridgedb.distributors package and put distributor code there. --- bridgedb/Bridges.py| 2 +- bridgedb/Main.py

[tor-commits] [bridgedb/master] Fix output of bridgedb --version.

2017-11-15 Thread isis
commit 914d0b9a158e3c210d17b84e3648a5962daa97ed Author: Isis Lovecruft Date: Wed Nov 1 20:56:23 2017 + Fix output of bridgedb --version. --- bridgedb/parse/options.py | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bridgedb/parse/options.py b/bridgedb/parse/o

[tor-commits] [bridgedb/master] Fix typo in docstring.

2017-11-15 Thread isis
commit 5a09a99ba05412e8f08323a54abeb927c024c57e Author: Isis Lovecruft Date: Wed Nov 1 20:56:03 2017 + Fix typo in docstring. --- bridgedb/distributors/https/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/

[tor-commits] [bridgedb/master] Move bridgedb.Main to bridgedb.main.

2017-11-15 Thread isis
commit 985923c9fa58a268fd8679f9e0193dd9411c8e59 Author: Isis Lovecruft Date: Wed Nov 1 22:58:39 2017 + Move bridgedb.Main to bridgedb.main. --- bridgedb/configure.py | 4 +- bridgedb/distributors/https/server.py | 2 +- bridgedb/{Main.py =>

[tor-commits] [bridgedb/develop] Exclude test/ directory from coverage results.

2017-11-15 Thread isis
commit 9ac6ff9e304fbfda71a84996e78c4ada8b43fb9a Author: Isis Lovecruft Date: Wed Nov 1 23:55:15 2017 + Exclude test/ directory from coverage results. --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index d16f7e2..737310b 100644 --- a/.cover

[tor-commits] [bridgedb/develop] Update Sphinx documentation build dependencies.

2017-11-15 Thread isis
commit de4b3e26d562ee810324ae33dff909dc7fd46758 Author: Isis Lovecruft Date: Wed Nov 1 23:56:13 2017 + Update Sphinx documentation build dependencies. --- doc/sphinx/requirements-for-sphinx-builds.txt | 11 ++- doc/sphinx/source/conf.py | 5 +++-- 2 files c

[tor-commits] [bridgedb/develop] No matter how much we test this, coverage will never notice.

2017-11-15 Thread isis
commit 35603395dcac11e10a0088c1e902b4eca6672e44 Author: Isis Lovecruft Date: Thu Nov 2 01:24:16 2017 + No matter how much we test this, coverage will never notice. --- bridgedb/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/main.py b/bridgedb/main.

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

2017-11-15 Thread isis
commit dda4bbee3c57314b16861304b1490b07b8caed7a Merge: 3560339 3667a63 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Merge branch 'fix/22871_r1' into develop .coveragerc | 1 + README.rst | 173 +

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

2017-11-15 Thread isis
commit b4d32c71285dcf6f37561476c4c86aebf495d549 Author: Isis Lovecruft Date: Tue Sep 12 21:33:22 2017 + Add CHANGELOG entries for BridgeDB 0.6.0. --- CHANGELOG | 12 1 file changed, 12 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 316e45d..7dbe222 100644 --- a/CH

[tor-commits] [bridgedb/develop] Fix Sphinx documentation to build with newer dependencies.

2017-11-15 Thread isis
commit 5ed3e53ebaf103dc0693e61825b1d5333730aa98 Author: Isis Lovecruft Date: Thu Nov 2 01:22:30 2017 + Fix Sphinx documentation to build with newer dependencies. --- doc/sphinx/source/bridgedb.distributors.email.rst | 15 +++ doc/sphinx/source/bridgedb.distributors.https.rs

[tor-commits] [bridgedb/develop] Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile().

2017-11-15 Thread isis
commit 0b68b8223ebec20e3bd6bdff0d3752509dadb337 Author: Isis Lovecruft Date: Thu Nov 2 01:02:41 2017 + Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile(). --- bridgedb/parse/blacklist.py | 12 +++- bridgedb/test/test_parse_blacklist.py | 56

[tor-commits] [bridgedb/develop] Fix bridgedb.main erroring unittests due to multi-bridgeauth code.

2017-11-15 Thread isis
commit c2ffe4f6785d846a083ffc347f13759e5d748c96 Author: Isis Lovecruft Date: Wed Nov 1 23:51:39 2017 + Fix bridgedb.main erroring unittests due to multi-bridgeauth code. --- bridgedb/main.py | 7 +- bridgedb/test/test_main.py | 53

[tor-commits] [bridgedb/develop] Fix typo in docstring.

2017-11-15 Thread isis
commit 5a09a99ba05412e8f08323a54abeb927c024c57e Author: Isis Lovecruft Date: Wed Nov 1 20:56:03 2017 + Fix typo in docstring. --- bridgedb/distributors/https/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/

[tor-commits] [bridgedb/develop] Upgrade coveralls dependency to 1.2.0.

2017-11-15 Thread isis
commit 93fc704cf3350313512df0d41d0ea7dd7b5901ac Author: Isis Lovecruft Date: Wed Nov 1 20:54:38 2017 + Upgrade coveralls dependency to 1.2.0. --- .travis.requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.requirements.txt b/.travis.requirements

[tor-commits] [bridgedb/develop] Add more tests for bridgedb.main.

2017-11-15 Thread isis
commit 00a9288a141158552ee56790211ed230704775d7 Author: Isis Lovecruft Date: Thu Nov 2 00:27:31 2017 + Add more tests for bridgedb.main. --- bridgedb/main.py | 4 ++-- bridgedb/test/test_main.py | 23 +++ 2 files changed, 25 insertions(+), 2 deletions(-)

[tor-commits] [bridgedb/develop] Make new bridgedb.distributors package and put distributor code there.

2017-11-15 Thread isis
commit fca25fc8d9295ab50cb2a1be39199c213ddf8751 Author: Isis Lovecruft Date: Wed Nov 1 20:44:24 2017 + Make new bridgedb.distributors package and put distributor code there. --- bridgedb/Bridges.py| 2 +- bridgedb/Main.py

[tor-commits] [bridgedb/develop] Move bridgedb.Main to bridgedb.main.

2017-11-15 Thread isis
commit 985923c9fa58a268fd8679f9e0193dd9411c8e59 Author: Isis Lovecruft Date: Wed Nov 1 22:58:39 2017 + Move bridgedb.Main to bridgedb.main. --- bridgedb/configure.py | 4 +- bridgedb/distributors/https/server.py | 2 +- bridgedb/{Main.py =>

[tor-commits] [bridgedb/develop] Add Makefile directive for making TAGS file.

2017-11-15 Thread isis
commit 8ebc712bd0706c607fb30222cb304c258bf14d83 Author: Isis Lovecruft Date: Wed Nov 1 23:55:35 2017 + Add Makefile directive for making TAGS file. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 906ce94..428f004 100644 --- a/Makefile +++ b

[tor-commits] [bridgedb/develop] Run scheduled tasks after server startup.

2017-11-15 Thread isis
commit 1112e2e650318c961e5eb8b4af574e9a825682b3 Author: Isis Lovecruft Date: Wed Nov 1 20:55:10 2017 + Run scheduled tasks after server startup. --- bridgedb/Main.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridgedb/Main.py b/bridgedb/Main.py index 53b70c

[tor-commits] [tor/maint-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 56b7407a9096eeed8af1b45bda5a149e7ffabb2c Merge: 67c62394b 754880585 Author: Nick Mathewson Date: Wed Nov 15 15:11:26 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 1 + 1 file changed, 1 insertion(+) ___ tor-c

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-15 Thread nickm
commit 2367b1ed319a138c40708f511cd6d5575109cece Merge: 01c5d4583 56b7407a9 Author: Nick Mathewson Date: Wed Nov 15 15:11:30 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24279 | 5 + configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) __

[tor-commits] [tor/maint-0.3.2] Fix configure libevent memory leak

2017-11-15 Thread nickm
commit 74b7bfbe471c953269ba8e5f4d808db3c0a9c8a6 Author: Alex Xu (Hello71) Date: Sun Oct 29 13:14:58 2017 + Fix configure libevent memory leak Breaks build with externally-specified hardening flags. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-15 Thread nickm
commit 8ff60b52889ecd40aa8311171bac619b0598da9b Merge: ceeacc734 56b7407a9 Author: Nick Mathewson Date: Wed Nov 15 15:11:30 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24279 | 5 + configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) _

[tor-commits] [tor/release-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 56b7407a9096eeed8af1b45bda5a149e7ffabb2c Merge: 67c62394b 754880585 Author: Nick Mathewson Date: Wed Nov 15 15:11:26 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 1 + 1 file changed, 1 insertion(+) ___ tor

[tor-commits] [tor/master] Fix configure libevent memory leak

2017-11-15 Thread nickm
commit 74b7bfbe471c953269ba8e5f4d808db3c0a9c8a6 Author: Alex Xu (Hello71) Date: Sun Oct 29 13:14:58 2017 + Fix configure libevent memory leak Breaks build with externally-specified hardening flags. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --

[tor-commits] [tor/maint-0.3.2] whoops; add missing credit.

2017-11-15 Thread nickm
commit 7548805850439bd6d6cff1c858c707ccbca94d29 Author: Nick Mathewson Date: Wed Nov 15 15:11:15 2017 -0500 whoops; add missing credit. --- changes/bug24279 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug24279 b/changes/bug24279 index b2d5698bb..ab2932b34 100644 --- a/chang

[tor-commits] [tor/master] whoops; add missing credit.

2017-11-15 Thread nickm
commit 7548805850439bd6d6cff1c858c707ccbca94d29 Author: Nick Mathewson Date: Wed Nov 15 15:11:15 2017 -0500 whoops; add missing credit. --- changes/bug24279 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug24279 b/changes/bug24279 index b2d5698bb..ab2932b34 100644 --- a/chang

[tor-commits] [tor/maint-0.3.2] Changes file for 24279.

2017-11-15 Thread nickm
commit f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 Author: Nick Mathewson Date: Wed Nov 15 15:09:11 2017 -0500 Changes file for 24279. --- changes/bug24279 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 0..b2d5698

[tor-commits] [tor/release-0.3.2] Fix configure libevent memory leak

2017-11-15 Thread nickm
commit 74b7bfbe471c953269ba8e5f4d808db3c0a9c8a6 Author: Alex Xu (Hello71) Date: Sun Oct 29 13:14:58 2017 + Fix configure libevent memory leak Breaks build with externally-specified hardening flags. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --

[tor-commits] [tor/master] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 67c62394bc0c8a1c7beb689908b968af454a828a Merge: ae8683621 f28559fd2 Author: Nick Mathewson Date: Wed Nov 15 15:09:33 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 4 configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) _

[tor-commits] [tor/maint-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 67c62394bc0c8a1c7beb689908b968af454a828a Merge: ae8683621 f28559fd2 Author: Nick Mathewson Date: Wed Nov 15 15:09:33 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 4 configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) _

[tor-commits] [tor/master] Changes file for 24279.

2017-11-15 Thread nickm
commit f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 Author: Nick Mathewson Date: Wed Nov 15 15:09:11 2017 -0500 Changes file for 24279. --- changes/bug24279 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 0..b2d5698

[tor-commits] [tor/release-0.3.2] whoops; add missing credit.

2017-11-15 Thread nickm
commit 7548805850439bd6d6cff1c858c707ccbca94d29 Author: Nick Mathewson Date: Wed Nov 15 15:11:15 2017 -0500 whoops; add missing credit. --- changes/bug24279 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug24279 b/changes/bug24279 index b2d5698bb..ab2932b34 100644 --- a/chang

[tor-commits] [tor/release-0.3.2] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 67c62394bc0c8a1c7beb689908b968af454a828a Merge: ae8683621 f28559fd2 Author: Nick Mathewson Date: Wed Nov 15 15:09:33 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 4 configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) _

[tor-commits] [tor/release-0.3.2] Changes file for 24279.

2017-11-15 Thread nickm
commit f28559fd2a70ae8e30477c3d6fa2ffc499a63e34 Author: Nick Mathewson Date: Wed Nov 15 15:09:11 2017 -0500 Changes file for 24279. --- changes/bug24279 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug24279 b/changes/bug24279 new file mode 100644 index 0..b2d5698

[tor-commits] [tor/master] Merge branch 'bug24279_030' into maint-0.3.2

2017-11-15 Thread nickm
commit 56b7407a9096eeed8af1b45bda5a149e7ffabb2c Merge: 67c62394b 754880585 Author: Nick Mathewson Date: Wed Nov 15 15:11:26 2017 -0500 Merge branch 'bug24279_030' into maint-0.3.2 changes/bug24279 | 1 + 1 file changed, 1 insertion(+) ___ tor

[tor-commits] [tor/master] Silence a warning about failed descriptor uploads.

2017-11-15 Thread nickm
commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a

[tor-commits] [tor/maint-0.3.2] Silence a warning about failed descriptor uploads.

2017-11-15 Thread nickm
commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

2017-11-15 Thread nickm
commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9 inserti

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-15 Thread nickm
commit 01c5d4583f3bc33c2c00b16ea269a2b03f5ac55e Merge: 7d1e47559 ae8683621 Author: Nick Mathewson Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9 insertions(+), 4 deletions

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-11-15 Thread nickm
commit ceeacc734da441051e8c3cfbab420b7083af89b7 Merge: bf8a7201c ae8683621 Author: Nick Mathewson Date: Wed Nov 15 14:25:25 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9 insertions(+), 4 deletions(-) __

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

2017-11-15 Thread nickm
commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9 inserti

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2

2017-11-15 Thread nickm
commit ae8683621add4b7fe68ba82f76b231ef8551477f Merge: 6dc784bdb c4a56ed5c Author: Nick Mathewson Date: Wed Nov 15 14:25:20 2017 -0500 Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2 changes/bug23662 | 4 src/or/directory.c | 9 + 2 files changed, 9 inserti

[tor-commits] [tor/release-0.3.2] Silence a warning about failed descriptor uploads.

2017-11-15 Thread nickm
commit c4a56ed5c2663ab76460407d6f5a4da8b0f8c600 Author: George Kadianakis Date: Tue Nov 14 17:16:33 2017 +0200 Silence a warning about failed descriptor uploads. Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-15 Thread translation
commit 679256146a21a811dcdfb1017b483dc2b03b47d3 Author: Translation commit bot Date: Wed Nov 15 17:46:58 2017 + Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-setting

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2017-11-15 Thread translation
commit 693ee84b5aa41e562ad800583cfff9560705eba1 Author: Translation commit bot Date: Wed Nov 15 17:46:36 2017 + Update translations for tor-launcher-properties --- zh_CN/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/torlauncher.pro

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2017-11-15 Thread translation
commit 816f5716b43e37f83076b278588c8c5d2aadbff1 Author: Translation commit bot Date: Wed Nov 15 17:46:42 2017 + Update translations for tor-launcher-properties_completed --- zh_CN/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zh_CN/torlaun

[tor-commits] [atlas/master] Restrict cache breaker to only Atlas specific resources

2017-11-15 Thread irl
commit 99a4fde894f2d53aec2941d6a82df2ee0d569077 Author: Iain R. Learmonth Date: Wed Nov 15 17:23:40 2017 + Restrict cache breaker to only Atlas specific resources --- index.html | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html i

[tor-commits] [atlas/master] Add cache breaker for our metrics resources

2017-11-15 Thread irl
commit dc76aba185f21c0947fb0417fc2b096aa031cea3 Author: Sebastian Hahn Date: Tue Nov 14 19:20:47 2017 +0100 Add cache breaker for our metrics resources This will hopefully fix a whole bunch of problems people are having when older resources are cached. --- index.html | 17

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-15 Thread translation
commit abf8be114944c39a5ab0fc1186eac4759fa52860 Author: Translation commit bot Date: Wed Nov 15 17:16:55 2017 + Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/network-set

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2017-11-15 Thread translation
commit 7ccf0afbec5532513e9a8bfb341d0e65fd901eeb Author: Translation commit bot Date: Wed Nov 15 16:50:28 2017 + Update translations for tails-greeter-2 --- ca/ca.po | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ca/ca.po b/ca/ca.po index 889357e02..d0cb897cd 10

[tor-commits] [translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed

2017-11-15 Thread translation
commit dacf94eb60ce3237e22271d35593bf6ca28effd9 Author: Translation commit bot Date: Wed Nov 15 16:50:33 2017 + Update translations for tails-greeter-2_completed --- ca/ca.po | 226 --- 1 file changed, 128 insertions(+), 98 de

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-15 Thread translation
commit 885652cacdfe5d3c53786d7eea0f0aeeec895537 Author: Translation commit bot Date: Wed Nov 15 16:46:58 2017 + Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff -

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2017-11-15 Thread translation
commit 9e4c6edaddf20926eb9ea3451120ec6386e9f734 Author: Translation commit bot Date: Wed Nov 15 16:47:04 2017 + Update translations for tor-launcher-network-settings_completed --- ca/network-settings.dtd | 61 ++--- 1 file changed, 22 inserti

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2017-11-15 Thread translation
commit b28dc68f5dd4a2b21ae3f23e1d8d3ba74fd1299a Author: Translation commit bot Date: Wed Nov 15 16:46:42 2017 + Update translations for tor-launcher-properties_completed --- ca/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ca/torlauncher.p

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2017-11-15 Thread translation
commit 1e67d142529324e386c0a9e9735fd5b834a67b32 Author: Translation commit bot Date: Wed Nov 15 16:46:37 2017 + Update translations for tor-launcher-properties --- ca/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/torlauncher.propertie

[tor-commits] [webwml/staging] Whoops; tag was not done before website update. Touch a file.

2017-11-15 Thread hiro
commit 7afecb27100a06aac6aaead4411481b589a5149c Author: Nick Mathewson Date: Wed Nov 8 16:50:15 2017 -0500 Whoops; tag was not done before website update. Touch a file. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index aee972a5..bb7df3c3 100644 --- a

[tor-commits] [webwml/staging] Add Peter back to people page

2017-11-15 Thread hiro
commit 1d0f0e5c58ed9fe979a8a63febf1b0408c40ffb5 Author: Damian Johnson Date: Fri Nov 10 10:05:02 2017 -0800 Add Peter back to people page Peter asked to be re-added with the entry he previously had. --- about/en/corepeople.wml | 51 -

[tor-commits] [webwml/staging] link to the surprise third blog post in the series

2017-11-15 Thread hiro
commit b672987aad6b996549c26ef17d28901e8e7f6e2e Author: Roger Dingledine Date: Fri Nov 10 17:57:00 2017 -0500 link to the surprise third blog post in the series --- docs/en/documentation.wml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en/documentation.wml

[tor-commits] [webwml/staging] Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging

2017-11-15 Thread hiro
commit 17f293417c8143abefebcef91921287e0c787778 Merge: 512790e7 92819ff8 Author: hiromipaw Date: Wed Nov 15 17:27:49 2017 +0100 Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging Makefile.common | 2 +- download/download.html.es | 476 ++

[tor-commits] [webwml/staging] Link to newsletter

2017-11-15 Thread hiro
commit 3517b71fcdd8228e836c00e241e2151a157688ef Author: Damian Johnson Date: Fri Nov 10 11:06:17 2017 -0800 Link to newsletter Oops, missed that there was a link on https://trac.torproject.org/projects/tor/ticket/24184 --- getinvolved/en/volunteer.wml | 3 ++- 1 file changed,

[tor-commits] [webwml/staging] bump alpha tor version to 0.3.2.4-alpha

2017-11-15 Thread hiro
commit 3b3f17cd919a42170bf32a09ccc5ef303fcf6000 Author: Nick Mathewson Date: Wed Nov 8 16:39:44 2017 -0500 bump alpha tor version to 0.3.2.4-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefil

[tor-commits] [webwml/staging] Two keys listed for Andreas

2017-11-15 Thread hiro
commit 08f6b05549319b42e225532389f43ce73d8ac0c8 Author: Damian Johnson Date: Tue Nov 14 09:56:03 2017 -0800 Two keys listed for Andreas Huh. We both had a copy of his key and link to db.torproject.org. Dropping the later. --- about/en/corepeople.wml | 1 - 1 file changed, 1 d

[tor-commits] [webwml/staging] the old tag got messed up by one of the gitweb updates

2017-11-15 Thread hiro
commit 9d5b66032161b027cb4c06509de38050f82c408e Author: Roger Dingledine Date: Fri Nov 10 21:16:43 2017 -0500 the old tag got messed up by one of the gitweb updates just use everywhere now. --- docs/en/documentation.wml| 4 ++-- getinvolved/en/volunteer.wml | 2 +- include/l

[tor-commits] [webwml/staging] Revert "Test localization again"

2017-11-15 Thread hiro
commit 57b7f6d736e73237becc5ea10222dc03872c90bf Author: hiromipaw Date: Wed Nov 15 17:28:24 2017 +0100 Revert "Test localization again" This reverts commit 92819ff8d59d13c4794876280f007c2de8bd8aeb. --- download/download.html.es | 476 --

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.0.10

2017-11-15 Thread hiro
commit 512790e7aa3460b58438ea1bc10cadf8ce0dcc5e Author: Nicolas Vigier Date: Tue Nov 14 19:25:14 2017 +0100 Add new Tor Browser version: 7.0.10 --- include/versions.wmi | 22 +++--- projects/torbrowser/RecommendedTBBVersions | 4 2 files changed,

[tor-commits] [webwml/staging] Revert "Test localization"

2017-11-15 Thread hiro
commit a61cc30e19b50748d287d7a21d97a69be1250fea Author: hiromipaw Date: Wed Nov 15 17:28:45 2017 +0100 Revert "Test localization" This reverts commit 11776a41aa5d3c6a84083b667f5cb5f1e4bc4100. --- Makefile.common | 2 +- download/es/download.wml | 376 ---

[tor-commits] [webwml/staging] Fix grammatical error (you -> you've) in security section.

2017-11-15 Thread hiro
commit 4098d1cae5a7229f38e88a285dac225c0ecb5695 Author: kat Date: Fri Nov 10 16:50:43 2017 -0500 Fix grammatical error (you -> you've) in security section. --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.w

[tor-commits] [webwml/staging] Remove Nicholas Merrill from people page

2017-11-15 Thread hiro
commit bc0196fc250a9db1d2e94d8d7d30b0bbed05c4f0 Author: Damian Johnson Date: Thu Nov 9 09:32:45 2017 -0800 Remove Nicholas Merrill from people page Oops, I screwed up. During the flurry of adding folks Nicholas and I had a discussion about if he was on tor-internal@ but then I

[tor-commits] [webwml/staging] Unrecommend 7.5a5/6 OS X and Linux versions

2017-11-15 Thread hiro
commit b7e94466177496a9946b78bc8bdb8c4d9a8d1499 Author: Georg Koppen Date: Tue Nov 7 13:06:03 2017 + Unrecommend 7.5a5/6 OS X and Linux versions --- projects/torbrowser/RecommendedTBBVersions | 4 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersi

[tor-commits] [webwml/staging] Add George to people page

2017-11-15 Thread hiro
commit 3f0e8734eb0df79c0ccfd7a457fd373ab39430cf Author: Damian Johnson Date: Mon Nov 6 10:06:37 2017 -0800 Add George to people page --- about/en/corepeople.wml | 120 ++-- 1 file changed, 64 insertions(+), 56 deletions(-) diff --git a/about/en/

[tor-commits] [webwml/staging] Replace tor website references of arm with nyx

2017-11-15 Thread hiro
commit 13e6c7b808a20dc6c15721268eb0286684ee8af7 Author: Damian Johnson Date: Tue Nov 7 09:28:47 2017 -0800 Replace tor website references of arm with nyx Think I got 'em all. Now that Nyx is live we can aggressively start dereferencing the old name. --- about/en/corepeople.wml

[tor-commits] [webwml/staging] Replace TWN with 'newsletter'

2017-11-15 Thread hiro
commit 41a5d2b1a4a30e730240c233146e31a2d53bc13d Author: Damian Johnson Date: Thu Nov 9 09:24:44 2017 -0800 Replace TWN with 'newsletter' Request by Steph on... https://trac.torproject.org/projects/tor/ticket/24184 --- getinvolved/en/volunteer.wml | 4 +--- 1 file change

[tor-commits] [webwml/staging] Add Antonela to people page

2017-11-15 Thread hiro
commit fdf5027f78f1ef2615293b6c27c56f67aef99ec7 Author: Damian Johnson Date: Mon Nov 13 11:19:01 2017 -0800 Add Antonela to people page --- about/en/corepeople.wml | 156 +-- images/people/antonela.png | Bin 0 -> 23267 bytes images/people

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-15 Thread translation
commit c672e9772c38dc4ea4363774bdedd3dee0d2258c Author: Translation commit bot Date: Wed Nov 15 16:16:57 2017 + Update translations for tor-launcher-network-settings --- ca/network-settings.dtd | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ca/network-se

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2017-11-15 Thread translation
commit 000c644b39ced7f1b7372f6d89f6730e81461eee Author: Translation commit bot Date: Wed Nov 15 10:47:03 2017 + Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd | 61 ++--- 1 file changed, 22 inserti

  1   2   >