[tor-commits] [snowflake/master] autocert (Let's Encrypt) for broker.

commit 2d89aa0b7bf10c571f934b846c363cf4a2b9b761 Author: David Fifield Date: Fri Jul 14 20:25:46 2017 -0700 autocert (Let's Encrypt) for broker. Replaces --cert and --key with --acme-hostnames and --acme-email. --- broker/README.md | 26

[tor-commits] [snowflake/master] Copy appengine directory from meek commit 6057a9e9d6.

commit a150a991d0c2ba66ca9e567bd088c603c9434775 Author: David Fifield Date: Sat Jul 15 11:48:28 2017 -0700 Copy appengine directory from meek commit 6057a9e9d6. --- appengine/README | 31 + appengine/app.yaml | 10 appengine/reflect.go | 127

[tor-commits] [snowflake/master] Merge branch 'standalone-broker'

commit 36debdfdd24e978fc323ec352852fc4af0bc4ae5 Merge: 3e3e4b8 827972e Author: David Fifield Date: Wed Aug 2 19:34:00 2017 -0700 Merge branch 'standalone-broker' appengine/README| 27 ++ {broker => appengine}/app.yaml | 3 --

[tor-commits] [snowflake/master] Customize reflect.go for Snowflake broker.

commit 827972e2bfebdfb0555228f69de48711a7e5f1b1 Author: David Fifield Date: Sat Jul 15 12:04:59 2017 -0700 Customize reflect.go for Snowflake broker. Don't need Meek-IP. --- appengine/README | 18 +++--- appengine/app.yaml | 3 ---

[tor-commits] [snowflake/master] Replace --webPort and --tlsPort with a single --addr option.

commit afe771690364e14586f24d98b65f0a2172cac1cc Author: David Fifield Date: Fri Jul 14 20:29:02 2017 -0700 Replace --webPort and --tlsPort with a single --addr option. --- broker/README.md | 4 +--- broker/broker.go | 11 +-- 2 files changed, 6

[tor-commits] [snowflake/master] go fmt

commit 1966612113d1583f9bbe458611e7ffcf19b8f257 Author: David Fifield Date: Fri Jul 14 20:06:00 2017 -0700 go fmt --- broker/broker.go | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index

[tor-commits] [snowflake/master] Fixed README.md and added cert and key options

commit edbe18d411cc53aab673927baf32a298d20c6972 Author: Hooman Date: Tue Jul 11 13:33:00 2017 -0700 Fixed README.md and added cert and key options --- broker/README.md | 17 - broker/app.yaml | 10 -- broker/broker.go | 20

[tor-commits] [snowflake/master] Server ports as parameters

commit 3f4f5d2292416dc7aeb6d091c174e20d779fe947 Author: Hooman Date: Wed Jul 12 12:07:28 2017 -0700 Server ports as parameters --- broker/broker.go | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index

[tor-commits] [snowflake/master] Move flag code out of init into main.

commit eaa82b8f9a0d3bafe32062ececbd4f8473bfcf86 Author: David Fifield Date: Fri Jul 14 20:00:25 2017 -0700 Move flag code out of init into main. --- broker/broker.go | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/broker/broker.go

[tor-commits] [snowflake/master] Make Broker run standalone

commit b7df69fa55629cfc3528d9daaea4e7e1dd7de005 Author: Hooman Date: Thu Jun 29 13:51:55 2017 -0700 Make Broker run standalone --- broker/broker.go| 41 +++-- broker/metrics.go | 2 +-

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

commit e6a1862124b5aa179c544ffd8aac81b9f05053eb Author: Translation commit bot Date: Thu Aug 3 01:49:40 2017 + Update translations for tor-browser-manual --- da/da.po | 5 + 1 file changed, 5 insertions(+) diff --git a/da/da.po b/da/da.po index

[tor-commits] [tor/release-0.3.1] Fix the hs_ntor integration tests to work with the pysha3 module

commit 8b5b7d470f4ef1957df77d343c8e87b1350351e3 Author: Nick Mathewson Date: Mon Jul 31 20:28:42 2017 -0400 Fix the hs_ntor integration tests to work with the pysha3 module The sha3 module should still work. Fixes bug 23071; bugfix on 0.3.1.1-alpha. ---

[tor-commits] [tor/master] Merge branch 'bug23071_031' into maint-0.3.1

commit a9a8d53dec3badb0176a1eebeaaa9aca04a4feff Merge: 830b7b31b ee849ee8b Author: Nick Mathewson Date: Wed Aug 2 12:51:42 2017 -0400 Merge branch 'bug23071_031' into maint-0.3.1 changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31

[tor-commits] [tor/release-0.3.1] Make the hs_ntor_ref logic more correct when there is no sha3 module

commit ee849ee8b6d099fb4de9d37ce6063a8955204b82 Author: Nick Mathewson Date: Wed Aug 2 12:44:39 2017 -0400 Make the hs_ntor_ref logic more correct when there is no sha3 module --- src/test/hs_ntor_ref.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

commit a9a8d53dec3badb0176a1eebeaaa9aca04a4feff Merge: 830b7b31b ee849ee8b Author: Nick Mathewson Date: Wed Aug 2 12:51:42 2017 -0400 Merge branch 'bug23071_031' into maint-0.3.1 changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31

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

commit 3938692f3280355f6f8d9b43ed5ac5b9c93bb48f Merge: 4872c28af a9a8d53de Author: Nick Mathewson Date: Wed Aug 2 12:51:46 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31

[tor-commits] [tor/master] Make the hs_ntor_ref logic more correct when there is no sha3 module

commit ee849ee8b6d099fb4de9d37ce6063a8955204b82 Author: Nick Mathewson Date: Wed Aug 2 12:44:39 2017 -0400 Make the hs_ntor_ref logic more correct when there is no sha3 module --- src/test/hs_ntor_ref.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [tor/master] Fix the hs_ntor integration tests to work with the pysha3 module

commit 8b5b7d470f4ef1957df77d343c8e87b1350351e3 Author: Nick Mathewson Date: Mon Jul 31 20:28:42 2017 -0400 Fix the hs_ntor integration tests to work with the pysha3 module The sha3 module should still work. Fixes bug 23071; bugfix on 0.3.1.1-alpha. ---

[tor-commits] [tor/maint-0.3.1] Make the hs_ntor_ref logic more correct when there is no sha3 module

commit ee849ee8b6d099fb4de9d37ce6063a8955204b82 Author: Nick Mathewson Date: Wed Aug 2 12:44:39 2017 -0400 Make the hs_ntor_ref logic more correct when there is no sha3 module --- src/test/hs_ntor_ref.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

commit c4c5077af2fad107c9fcebdd3a7999da7b8ee904 Merge: 706364238 a9a8d53de Author: Nick Mathewson Date: Wed Aug 2 12:51:46 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31 --- 2 files

[tor-commits] [tor/maint-0.3.1] Fix the hs_ntor integration tests to work with the pysha3 module

commit 8b5b7d470f4ef1957df77d343c8e87b1350351e3 Author: Nick Mathewson Date: Mon Jul 31 20:28:42 2017 -0400 Fix the hs_ntor integration tests to work with the pysha3 module The sha3 module should still work. Fixes bug 23071; bugfix on 0.3.1.1-alpha. ---

[tor-commits] [tor/maint-0.3.1] Merge branch 'bug23071_031' into maint-0.3.1

commit a9a8d53dec3badb0176a1eebeaaa9aca04a4feff Merge: 830b7b31b ee849ee8b Author: Nick Mathewson Date: Wed Aug 2 12:51:42 2017 -0400 Merge branch 'bug23071_031' into maint-0.3.1 changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31

[tor-commits] [tor-browser-build/master] Bug 23075: add an option to select the number of cores used

commit 60ba86636df928e97e265417b2c19bea4e85ea3a Author: Nicolas Vigier Date: Wed Aug 2 18:23:10 2017 +0200 Bug 23075: add an option to select the number of cores used --- README| 12 projects/binutils/build | 2 +-

[tor-commits] [tor-browser-build/master] Revert "Bug 22362: NoScript's XSS filter freezes the browser"

commit 11244c5913e47ca12234ea3542d7e028171962bd Author: Georg Koppen Date: Mon Jul 31 13:25:10 2017 + Revert "Bug 22362: NoScript's XSS filter freezes the browser" This reverts commit cec0a1d787b90f1b27c92ba83bd8f12b5a3b0fb1 That's properly fixed

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

commit abe5b07c13bb6442c14b1b71c5df75d846095c37 Merge: c33db290a 8925e84be Author: Nick Mathewson Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/master] Forward-port 0.3.0.10 changelog

commit ebce26b5cbc3bf540f06ce63730a170225673646 Author: Nick Mathewson Date: Wed Aug 2 12:29:40 2017 -0400 Forward-port 0.3.0.10 changelog --- ChangeLog| 71 ReleaseNotes | 71

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245 Merge: 71248800f 8925e84be Author: Nick Mathewson Date: Wed Aug 2 12:28:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 4872c28afa5295b81f05def0b763022ac093bd09 Merge: 9409d98ee 830b7b31b Author: Nick Mathewson Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 ___ tor-commits mailing list

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

commit 706364238e7a1f78c8358f870c1446cb3e214319 Merge: ebce26b5c 830b7b31b Author: Nick Mathewson Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245 Merge: 71248800f 8925e84be Author: Nick Mathewson Date: Wed Aug 2 12:28:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/master] version bump to 0.3.0.10-dev

commit 8925e84beb3d9916026746f282bbaacc1b886818 Author: Nick Mathewson Date: Wed Aug 2 12:28:34 2017 -0400 version bump to 0.3.0.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.1] version bump to 0.3.0.10-dev

commit 8925e84beb3d9916026746f282bbaacc1b886818 Author: Nick Mathewson Date: Wed Aug 2 12:28:34 2017 -0400 version bump to 0.3.0.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245 Merge: 71248800f 8925e84be Author: Nick Mathewson Date: Wed Aug 2 12:28:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.0] version bump to 0.3.0.10-dev

commit 8925e84beb3d9916026746f282bbaacc1b886818 Author: Nick Mathewson Date: Wed Aug 2 12:28:34 2017 -0400 version bump to 0.3.0.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.1] version bump to 0.3.0.10-dev

commit 8925e84beb3d9916026746f282bbaacc1b886818 Author: Nick Mathewson Date: Wed Aug 2 12:28:34 2017 -0400 version bump to 0.3.0.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.0] version bump to 0.3.0.10-dev

commit 8925e84beb3d9916026746f282bbaacc1b886818 Author: Nick Mathewson Date: Wed Aug 2 12:28:34 2017 -0400 version bump to 0.3.0.10-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [webwml/master] Update stable to 0.3.0.10

commit 1a9bc4f06e4bef6c352e8caa80a5d48c394a2db8 Author: Nick Mathewson Date: Wed Aug 2 12:26:00 2017 -0400 Update stable to 0.3.0.10 --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

commit e5b6753acd0c39aecee51ee6cbb3cf0e8eb68d4f Author: Translation commit bot Date: Wed Aug 2 16:19:37 2017 + Update translations for tor-browser-manual --- de/de.po | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/de/de.po

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

commit 6554d47282ee45095e455c7fb86f9c62115029dc Author: Translation commit bot Date: Wed Aug 2 16:19:42 2017 + Update translations for tor-browser-manual_completed --- de/de.po | 1883 ++ 1 file

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

commit 1a7a8eca74eec01f87e1c10d8e7102a1ee628851 Author: Translation commit bot Date: Wed Aug 2 16:15:47 2017 + Update translations for liveusb-creator_completed --- de/de.po | 857 ++- 1 file

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

commit 944111b3c415563fb1b835daa331a460d3d9facc Author: Translation commit bot Date: Wed Aug 2 16:15:42 2017 + Update translations for liveusb-creator --- de/de.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git

[tor-commits] [tor/release-0.3.0] Remove an extraneous "alpha".

commit c33db290a9d8d0f921ef8ce0f49803748b5e47e0 Author: Nick Mathewson Date: Wed Aug 2 11:50:57 2017 -0400 Remove an extraneous "alpha". --- ChangeLog| 2 +- ReleaseNotes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog

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

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.

[tor-commits] [tor/master] Bump to 0.3.0.10

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

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

commit 514212ed660a85d27dc285874971636f543235f1 Merge: df16f89a8 4f7955d5d Author: Nick Mathewson Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 9409d98ee930541937c9e6b8e09f7e3097f744c1 Merge: ef592d133 71248800f Author: Nick Mathewson Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.

[tor-commits] [tor/release-0.3.0] Bump to 0.3.0.10

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/release-0.3.1] Bump to 0.3.0.10

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

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

commit 256c1b73e31c0bfb6e48e404f307ca0eb2516408 Merge: c1edd83dd 71248800f Author: Nick Mathewson Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.1] Bump to 0.3.0.10

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/maint-0.3.0] Bump to 0.3.0.10

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.