October 2019 - tor-commits - lists.torproject.org

[tpo/master] Updates with banner
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 29f697caa022a74a53e4b21d6dcea8eb43e20114 Author: hiro <hiro(a)torproject.org> Date: Sat Oct 26 00:14:52 2019 +0200 Updates with banner --- lego | 2 +- templates/homepage.html | 1 + templates/layout.html | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lego b/lego index 91aeb8f..eeeb665 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 91aeb8fa5d9492c9fd2b4e86368b2409869ac66f +Subproject commit eeeb665a9b147f046fc9029b8733956982dcebc0 diff --git a/templates/homepage.html b/templates/homepage.html index 0710d17..43663a7 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -18,6 +18,7 @@ </div> </div> </div> + {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html> diff --git a/templates/layout.html b/templates/layout.html index ab0e998..e626e2c 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,6 +12,7 @@ </div> </div> </div> + {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html>

1 0

[tpo/master] Update banner and put it live
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 1f7a4f7ea14d684b28e632f4a5d4a0f1a945331c Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 16:46:51 2019 +0100 Update banner and put it live --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index eeeb665..e01f110 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit eeeb665a9b147f046fc9029b8733956982dcebc0 +Subproject commit e01f110c3cae590d5b84987dc05bfa028322ccc3

1 0

[tpo/master] Update digital climate strike banner
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 0b0aec730351019c5d9484015db3efa0c00354f6 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 16 14:10:29 2019 +0200 Update digital climate strike banner --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 77fc882..09c5813 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 77fc882c7f54abb72c81d6fcd8c2fcc88e32781c +Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790

1 0

[tpo/master] Merge master
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 95e62263a11bbd162f1da643f45e86f70a8c9886 Merge: 0b0aec7 ff50627 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 23:26:25 2019 +0200 Merge master .htaccess | 9 +- assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/keys/sstevenson.txt | 79 + content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 2 + content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 91 + content/about/people/ahf/contents.lr | 2 +- content/about/people/anarcat/contents.lr | 17 + content/about/people/arma/contents.lr | 2 +- content/about/people/igt0/contents.lr | 17 - content/about/people/meejah/contents.lr | 2 + content/about/people/schneier-core/contents.lr | 15 + content/about/people/schneier/contents.lr | 13 + content/about/people/sstevenson/contents.lr | 4 + content/about/people/wshackleton/contents.lr | 20 + .../about/sponsors/DARPA-georgetown/contents.lr | 19 + .../about/sponsors/USSD-DHRL-harvard/contents.lr | 4 +- content/about/sponsors/USSD-DHRL/contents.lr | 3 +- content/about/sponsors/nsf-georgetown/contents.lr | 7 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 4 +- content/about/sponsors/otf/contents.lr | 3 +- content/download/languages/contents.lr | 2 +- content/press/new-release-tor-browser/contents.lr | 2 +- .../torbrowser/RecommendedTBBVersions/contents.lr | 16 +- databags/download-alternatives.ini | 8 + databags/versions.ini | 14 +- lego | 2 +- models/job.ini | 4 + models/person.ini | 5 + templates/contact.html | 4 +- templates/download-android.html | 10 +- templates/download-options.html | 5 + templates/download-tor.html | 10 +- templates/hero-download.html | 2 +- templates/homepage.html | 10 +- templates/jobs.html | 2 +- templates/layout.html | 9 +- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 8 +- templates/macros/people.html | 3 + templates/meta.html | 9 + 50 files changed, 8270 insertions(+), 84 deletions(-)

1 0

[lego/master] Update template
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit e01f110c3cae590d5b84987dc05bfa028322ccc3 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 16:44:52 2019 +0100 Update template --- templates/bottom_banner.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/bottom_banner.html b/templates/bottom_banner.html index 31c1603..08f782f 100644 --- a/templates/bottom_banner.html +++ b/templates/bottom_banner.html @@ -3,14 +3,18 @@ <label for="trigger" class="footer__close text-white">X</label> <span class="eoy-sr-only text-white">Close banner</span> <div class="eoy-banner row col-md-12" id="banner-header" role="contentinfo"> - <div class="col-lg-2 col-md-2 col-sm-1"></div> - <div class="col-lg-8 col-md-8 col-sm-4"> + <div class="col-lg-3 col-md-1"></div> + <div class="col-lg-6 col-md-10"> <div class="col-12 p-5"> <div class="row"> <h4 class="tracking-surveillan">Tracking, surveillance, and censorship are widespread online.</h4> </div> <div class="row"> - <h2 class="take-back-the-intern display-3">TAKE BACK THE INTERNET WITH TOR</h2> + <h2 class="take-back-the-intern display-3 py-3"> + TAKE BACK<br /> + THE INTERNET<br /> + WITH TOR + </h2> </div> <div class="row"> <a class="btn-lg rectangle" href="https://donate.torproject.org">DONATE NOW</a> @@ -18,7 +22,7 @@ </div> </div> </div> - <div class="col-lg-2 col-md-2 col-sm-1"> + <div class="col-lg-3 col-md-1"> </div> </div> </div>

1 0

[lego/master] Update css
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 146fbc11278661cd569f24aa44652fd793cc7b26 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 16:39:58 2019 +0100 Update css --- assets/static/css/eoy.css | 55 +++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/assets/static/css/eoy.css b/assets/static/css/eoy.css index 27027ff..934f17b 100644 --- a/assets/static/css/eoy.css +++ b/assets/static/css/eoy.css @@ -16,19 +16,6 @@ z-index: 100000000000000 !important; } -.banner__containter { - position: fixed; - right: 0; - left: 0; - bottom: 0; - padding: 1.25rem 1.25rem 2rem; - width: 100%; - background-image: url('../images/home/png/take-back(a)3x.png'); - background-position: bottom 10% right 30%; - background-repeat: no-repeat; - background-size: contain; -} - .footer__close { height: 3rem; position: absolute; @@ -50,23 +37,55 @@ } .take-back-the-intern { - color: #2FFF00; + color: lime; font-family: League Gothic !important; font-style: italic; font-weight: 400 !important; text-align: left; + width: 40%; + line-height: 4rem !important; + right: 8px; + position: relative; +} + +.rectangle { + border: 3px solid blueviolet !important; + color: white !important; + border-radius: 0 !important; + font-family: League Gothic; + font-size: 2rem !important; + padding: 0 20px !important; +} + +.rectangle:hover{ + text-decoration: none; + color: white; + background: blueviolet; } .give-today-and-mozi { - color: #FFFFFF; + color: white; font-family: Source Code Pro; font-weight: 400; text-align: left; + font-size: 16px; + margin-bottom: 0; + line-height: 4em; } -.rectangle { - border: 3px solid #8A2BE2 !important; - color: #FFFFFF !important; +.banner__containter { + + position: fixed; + right: 0; + left: 0; + bottom: 0; + padding: 1.25rem 1.25rem 2rem; + width: 100%; + background-image: url('../images/home/png/take-back(a)3x.png'); + background-position: bottom 10% right 45%; + background-repeat: no-repeat; + background-size: contain; + } .eoy-sr-only {

1 0

[snowflake/master] bump version to 0.0.13
by cohosh＠torproject.org 28 Oct '19

28 Oct '19

commit 338f1792b8a917abd2f2682b92c9149a1ba27b3b Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Oct 28 10:55:51 2019 -0400 bump version to 0.0.13 --- proxy/translation | 2 +- proxy/webext/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/translation b/proxy/translation index 51388b6..120578e 160000 --- a/proxy/translation +++ b/proxy/translation @@ -1 +1 @@ -Subproject commit 51388b65646e35e2a6858e7b1d88f459c7adc13c +Subproject commit 120578ec9dbf0975fc9ac573130282f628b9747a diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 47b7799..b3c757a 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.0.12", + "version": "0.0.13", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[snowflake/master] Increase proxy poll interval to 300 s.
by cohosh＠torproject.org 28 Oct '19

28 Oct '19

commit e408988387b74e6a2fe992783b728fd5ec917c10 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 12:53:17 2019 -0600 Increase proxy poll interval to 300 s. https://bugs.torproject.org/32129 --- proxy/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/config.js b/proxy/config.js index 54c4c32..95ae92e 100644 --- a/proxy/config.js +++ b/proxy/config.js @@ -20,7 +20,7 @@ Config.prototype.minRateLimit = 10 * 1024; Config.prototype.rateLimitHistory = 5.0; -Config.prototype.defaultBrokerPollInterval = 20.0 * 1000; +Config.prototype.defaultBrokerPollInterval = 300.0 * 1000; Config.prototype.maxNumClients = 1;

1 0

[snowflake/master] Remove now unecessary timeoutConn
by cohosh＠torproject.org 28 Oct '19

28 Oct '19

commit 11bd32f62e8b662dda82fe8fd78017a8a80b57f5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Oct 25 15:45:06 2019 -0400 Remove now unecessary timeoutConn --- proxy-go/snowflake.go | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 68f8b67..9b7dad2 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -204,38 +204,19 @@ func sendAnswer(sid string, pc *webrtc.PeerConnection) error { return nil } -type timeoutConn struct { - c net.Conn - t time.Duration -} - -func (tc timeoutConn) Read(buf []byte) (int, error) { - return tc.c.Read(buf) -} - -func (tc timeoutConn) Write(buf []byte) (int, error) { - return tc.c.Write(buf) -} - -func (tc timeoutConn) Close() error { - return tc.c.Close() -} - -func CopyLoopTimeout(c1 net.Conn, c2 net.Conn, timeout time.Duration) { - tc1 := timeoutConn{c: c1, t: timeout} - tc2 := timeoutConn{c: c2, t: timeout} +func CopyLoop(c1 net.Conn, c2 net.Conn) { var wg sync.WaitGroup copyer := func(dst io.ReadWriteCloser, src io.ReadWriteCloser) { defer wg.Done() if _, err := io.Copy(dst, src); err != nil { - log.Printf("io.Copy inside CopyLoopTimeout generated an error: %v", err) + log.Printf("io.Copy inside CopyLoop generated an error: %v", err) } dst.Close() src.Close() } wg.Add(2) - go copyer(tc1, tc2) - go copyer(tc2, tc1) + go copyer(c1, c2) + go copyer(c2, c1) wg.Wait() } @@ -271,7 +252,7 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { log.Printf("connected to relay") defer wsConn.Close() wsConn.PayloadType = websocket.BinaryFrame - CopyLoopTimeout(conn, wsConn, time.Minute) + CopyLoop(conn, wsConn) log.Printf("datachannelHandler ends") }

1 0

[tor/master] nodelist: fix a comment typo in routerset.h
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit bf16efeb07a9bc58f6f6c90e79f3d3a0798cf8d0 Author: teor <teor(a)torproject.org> Date: Mon Oct 28 23:44:08 2019 +1000 nodelist: fix a comment typo in routerset.h --- src/feature/nodelist/routerset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/nodelist/routerset.h b/src/feature/nodelist/routerset.h index f3bf4a1f7..dc6ce0b66 100644 --- a/src/feature/nodelist/routerset.h +++ b/src/feature/nodelist/routerset.h @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ /** - * \file routerlist.h + * \file routerset.h * \brief Header file for routerset.c **/

1 0