August 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bump versions for nightlies
by gk＠torproject.org 02 Aug '16

02 Aug '16

commit edfaa1e39cb9cfc3d0c019116b98e71aa9c788eb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 2 09:50:36 2016 +0000 Bump versions for nightlies --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7d66421..749f8ea 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -54,7 +54,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 02 Aug '16

02 Aug '16

commit 8e526b741f2b56ed926096ac393522ee7253382d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 2 09:46:45 2016 +0000 Update translations for tails-misc_completed --- el.po | 59 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/el.po b/el.po index cac461e..ce30d2a 100644 --- a/el.po +++ b/el.po @@ -5,6 +5,7 @@ # Translators: # Adrian Pappas <pappasadrian(a)gmail.com>, 2013,2015 # Aikaterini Katmada, 2015 +# Alex Calpos <alepro2015(a)outlook.com>, 2016 # Alex <hestia(a)riseup.net>, 2013 # andromeas <andromeas(a)hotmail.com>, 2014 # andromeas <andromeas(a)hotmail.com>, 2014 @@ -23,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-25 19:53+0000\n" -"Last-Translator: anvo <fragos.george(a)hotmail.com>\n" +"POT-Creation-Date: 2016-07-31 10:43+0200\n" +"PO-Revision-Date: 2016-08-02 09:43+0000\n" +"Last-Translator: Alex Calpos <alepro2015(a)outlook.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,13 +75,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Θέλετε να εκκινήσετε το Electrum ούτως ή άλλως;" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:37 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Εκκίνηση" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:38 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Έξοδος" @@ -242,23 +243,29 @@ msgstr "Έξοδος του GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Άλλα μηνύματα που παρέχονται από το GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:27 msgid "The Claws Mail persistence feature is activated." msgstr "Η λειτουργία μονιμότητας του Claws Mail είναι ενεργοποιημένη." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:29 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Αν έχετε μηνύματα ηλεκτρονικού ταχυδρομείου αποθηκευμένα στο Claws Mail, πρέπει να <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>μεταφέρετε τα δεδομένα σας</a> πριν ξεκινήσετε το Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:34 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Εάν έχετε ήδη μεταφέρει τα μηνύματά σας στο Icedove, θα πρέπει να <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>διαγράψετε όλα τα δεδομένα από το Claws Mail data</a> για φύγει αυτή η προειδοποίηση." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Επανεκκίνηση " #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 msgid "Power Off" msgstr "Απενεργοποίηση" @@ -426,60 +433,60 @@ msgid "" "register to activate your Internet connection." msgstr "Η δραστηριότητα μέσα από Unsafe Browser δεν είναι ανώνυμη.\\n Χρησιμοποιήστε Unsafe Browser μόνο όταν είναι αναγκαίο, για παράδειγμα\\n αν χρειάζεται να συνδεθείτε ή να δημιουργήσετε για την ενεργοποίηση της σύνδεσης στο διαδίκτυο." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." msgstr "Εκκίνηση του μη ασφαλή Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "This may take a while, so please be patient." msgstr "Αυτό μπορεί να πάρει λίγο χρόνο, παρακαλούμε κάντε υπομονή." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "Shutting down the Unsafe Browser..." msgstr "Κλείσιμο του μη ασφαλή Browser..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Αυτό μπορεί να πάρει λίγη ώρα, και δεν πρέπει να επανεκκινήσετε τον μη ασφαλή Browser μέχρι να κλείσει μόνος του σωστά." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 msgid "Failed to restart Tor." msgstr "Αποτυχία επανεκκίνησης του Tor." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "Μη ασφαλής Browser" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "Ένας άλλος Μη-Ασφαλής Browser εκτελείται αυτή τη στιγμή, ή του γίνεται εκκαθάριση. Παρακαλώ δοκιμάστε ξανά σε λίγο." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104 msgid "" "NetworkManager passed us garbage data when trying to deduce the clearnet DNS" " server." msgstr "Ο NetworkManager μας έδωσε δεδομένα - απορίμματα στην προσπάθεια εξαγωγής του διακομιστή clearnet DNS." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "Δεν αποκτήθηκε DNS server μέσω DHCP ή μέσω χειροκίνητης ρύθμισης στο NetworkManager." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:123 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:122 msgid "Failed to setup chroot." msgstr "Αποτυχία ρύθμισης chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:128 msgid "Failed to configure browser." msgstr "Αποτυχία ρύθμισης του browser." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:133 msgid "Failed to run browser." msgstr "Αποτυχία εκτέλεησης του browser." @@ -545,18 +552,6 @@ msgstr "I2P πρόγραμμα περιήγησης" msgid "Learn more about Tails" msgstr "Μάθετε περισσότερα σχετικά με Tails" -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:1 -msgid "Reboot" -msgstr "Επανεκκίνηση" - -#: ../config/chroot_local-includes/usr/share/applications/tails-reboot.desktop.in.h:2 -msgid "Immediately reboot computer" -msgstr "Άμεση επανεκκίνηση υπολογιστή" - -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 -msgid "Immediately shut down computer" -msgstr "Άμεση απενεργοποίηση υπολογιστή" - #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" msgstr "Tor Browser"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 02 Aug '16

02 Aug '16

commit d99755525cbcee64058e28a249e83ed2e6554bea Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 2 09:46:09 2016 +0000 Update translations for tails-misc --- el.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/el.po b/el.po index ba8f0b2..ce30d2a 100644 --- a/el.po +++ b/el.po @@ -5,6 +5,7 @@ # Translators: # Adrian Pappas <pappasadrian(a)gmail.com>, 2013,2015 # Aikaterini Katmada, 2015 +# Alex Calpos <alepro2015(a)outlook.com>, 2016 # Alex <hestia(a)riseup.net>, 2013 # andromeas <andromeas(a)hotmail.com>, 2014 # andromeas <andromeas(a)hotmail.com>, 2014 @@ -23,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-07-31 10:43+0200\n" +"PO-Revision-Date: 2016-08-02 09:43+0000\n" +"Last-Translator: Alex Calpos <alepro2015(a)outlook.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -258,7 +259,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Εάν έχετε ήδη μεταφέρει τα μηνύματά σας στο Icedove, θα πρέπει να <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>διαγράψετε όλα τα δεδομένα από το Claws Mail data</a> για φύγει αυτή η προειδοποίηση." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[metrics-web/master] Upgrade collectdescs module to metrics-lib 1.3.1.
by karsten＠torproject.org 02 Aug '16

02 Aug '16

commit 82cdfc504aad0a180b1b85fe7de4b72ae940978f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 2 11:16:45 2016 +0200 Upgrade collectdescs module to metrics-lib 1.3.1. --- modules/collectdescs/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/collectdescs/build.xml b/modules/collectdescs/build.xml index 3e7fbf0..5d17d4e 100644 --- a/modules/collectdescs/build.xml +++ b/modules/collectdescs/build.xml @@ -8,7 +8,7 @@ <fileset dir="${libs}"> <include name="commons-compress-1.9.jar"/> <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.2.0.jar"/> + <include name="descriptor-1.3.1.jar"/> </fileset> </path>

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 Aug '16

01 Aug '16

commit ff87af3490e1b14be48008d0075f39e45d510652 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 1 19:45:29 2016 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index a562191..6797ded 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,7 +43,7 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentella regler"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Kan orsaka varningar eller avbrott. Inaktiverad som standard."> -<!ENTITY https-everywhere.chrome.add_rule "Lägg till en reger för denna sida"> +<!ENTITY https-everywhere.chrome.add_rule "Lägg till en regel för denna sida"> <!ENTITY https-everywhere.chrome.add_new_rule "Lägg till en ny regel för denna sida"> <!ENTITY https-everywhere.chrome.always_https_for_host "Använd alltid https för denna värd"> <!ENTITY https-everywhere.chrome.host "Värd:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 Aug '16

01 Aug '16

commit 019213bcc549d7e50bf834483671dbabd2edab8c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 1 19:45:24 2016 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index a562191..6797ded 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -43,7 +43,7 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentella regler"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Kan orsaka varningar eller avbrott. Inaktiverad som standard."> -<!ENTITY https-everywhere.chrome.add_rule "Lägg till en reger för denna sida"> +<!ENTITY https-everywhere.chrome.add_rule "Lägg till en regel för denna sida"> <!ENTITY https-everywhere.chrome.add_new_rule "Lägg till en ny regel för denna sida"> <!ENTITY https-everywhere.chrome.always_https_for_host "Använd alltid https för denna värd"> <!ENTITY https-everywhere.chrome.host "Värd:">

1 0

[snowflake/master] ensure closing stale remotes from the client side
by serene＠torproject.org 01 Aug '16

01 Aug '16

commit ac9d49b8727b953c12a76e3645fe71a9ec3aab75 Author: Serene H <git(a)keroserene.net> Date: Mon Aug 1 12:17:28 2016 -0700 ensure closing stale remotes from the client side --- client/snowflake.go | 3 +- client/webrtc.go | 81 ++++++++++++++++++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 30 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 8dfa390..75e999f 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -20,6 +20,7 @@ import ( const ( ReconnectTimeout = 10 DefaultSnowflakeCapacity = 1 + SnowflakeTimeout = 30 ) // When a connection handler starts, +1 is written to this channel; when it @@ -81,7 +82,7 @@ func handler(socks SocksConnector, snowflakes SnowflakeCollector) error { return errors.New("handler: Received invalid Snowflake") } defer socks.Close() - defer snowflake.Reset() + defer snowflake.Close() log.Println("---- Handler: snowflake assigned ----") err := socks.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { diff --git a/client/webrtc.go b/client/webrtc.go index 1f7ac00..0492466 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -29,6 +29,7 @@ type WebRTCPeer struct { errorChannel chan error recvPipe *io.PipeReader writePipe *io.PipeWriter + lastReceive time.Time buffer bytes.Buffer reset chan struct{} @@ -37,6 +38,28 @@ type WebRTCPeer struct { BytesLogger } +// Construct a WebRTC PeerConnection. +func NewWebRTCPeer(config *webrtc.Configuration, + broker *BrokerChannel) *WebRTCPeer { + connection := new(WebRTCPeer) + connection.id = "snowflake-" + uniuri.New() + connection.config = config + connection.broker = broker + connection.offerChannel = make(chan *webrtc.SessionDescription, 1) + connection.answerChannel = make(chan *webrtc.SessionDescription, 1) + // Error channel is mostly for reporting during the initial SDP offer + // creation & local description setting, which happens asynchronously. + connection.errorChannel = make(chan error, 1) + connection.reset = make(chan struct{}, 1) + + // Override with something that's not NullLogger to have real logging. + connection.BytesLogger = &BytesNullLogger{} + + // Pipes remain the same even when DataChannel gets switched. + connection.recvPipe, connection.writePipe = io.Pipe() + return connection +} + // Read bytes from local SOCKS. // As part of |io.ReadWriter| func (c *WebRTCPeer) Read(b []byte) (int, error) { @@ -47,6 +70,7 @@ func (c *WebRTCPeer) Read(b []byte) (int, error) { // As part of |io.ReadWriter| func (c *WebRTCPeer) Write(b []byte) (int, error) { c.BytesLogger.AddOutbound(len(b)) + // TODO: Buffering could be improved / separated out of WebRTCPeer. if nil == c.transport { log.Printf("Buffered %d bytes --> WebRTC", len(b)) c.buffer.Write(b) @@ -61,45 +85,42 @@ func (c *WebRTCPeer) Close() error { if c.closed { // Skip if already closed. return nil } - log.Printf("WebRTC: Closing") - c.cleanup() // Mark for deletion. c.closed = true + c.cleanup() + c.Reset() + log.Printf("WebRTC: Closing") return nil } // As part of |Resetter| func (c *WebRTCPeer) Reset() { - c.Close() - go func() { - c.reset <- struct{}{} - log.Println("WebRTC resetting...") - }() + if nil == c.reset { + return + } + c.reset <- struct{}{} } // As part of |Resetter| func (c *WebRTCPeer) WaitForReset() { <-c.reset } -// Construct a WebRTC PeerConnection. -func NewWebRTCPeer(config *webrtc.Configuration, - broker *BrokerChannel) *WebRTCPeer { - connection := new(WebRTCPeer) - connection.id = "snowflake-" + uniuri.New() - connection.config = config - connection.broker = broker - connection.offerChannel = make(chan *webrtc.SessionDescription, 1) - connection.answerChannel = make(chan *webrtc.SessionDescription, 1) - // Error channel is mostly for reporting during the initial SDP offer - // creation & local description setting, which happens asynchronously. - connection.errorChannel = make(chan error, 1) - connection.reset = make(chan struct{}, 1) - - // Override with something that's not NullLogger to have real logging. - connection.BytesLogger = &BytesNullLogger{} - - // Pipes remain the same even when DataChannel gets switched. - connection.recvPipe, connection.writePipe = io.Pipe() - return connection +// Prevent long-lived broken remotes. +// Should also update the DataChannel in underlying go-webrtc's to make Closes +// more immediate / responsive. +func (c *WebRTCPeer) checkForStaleness() { + c.lastReceive = time.Now() + for { + if c.closed { + return + } + if time.Since(c.lastReceive).Seconds() > SnowflakeTimeout { + log.Println("WebRTC: No messages received for", SnowflakeTimeout, + "seconds -- closing stale connection.") + c.Close() + return + } + <-time.After(time.Second) + } } // As part of |Connector| interface. @@ -119,6 +140,7 @@ func (c *WebRTCPeer) Connect() error { if err != nil { return err } + go c.checkForStaleness() return nil } @@ -208,7 +230,7 @@ func (c *WebRTCPeer) establishDataChannel() error { // Disable the DataChannel as a write destination. log.Println("WebRTC: DataChannel.OnClose [remotely]") c.transport = nil - c.Reset() + c.Close() } dc.OnMessage = func(msg []byte) { if len(msg) <= 0 { @@ -225,6 +247,7 @@ func (c *WebRTCPeer) establishDataChannel() error { log.Println("Error: short write") panic("short write") } + c.lastReceive = time.Now() } log.Println("WebRTC: DataChannel created.") return nil @@ -257,7 +280,7 @@ func (c *WebRTCPeer) exchangeSDP() error { } case err := <-c.errorChannel: log.Println("Failed to prepare offer", err) - c.Reset() + c.Close() return err } // Keep trying the same offer until a valid answer arrives.

1 0

[tor-messenger-build/updater] Add patch to set updater window brand name
by sukhbir＠torproject.org 01 Aug '16

01 Aug '16

commit 6d7b1c1ce2387e028169a704b7da6baef2451944 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jul 30 20:50:13 2016 -0400 Add patch to set updater window brand name --- projects/instantbird/config | 1 + projects/instantbird/updater-text.patch | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 2e53a6a..676bf14 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,6 +105,7 @@ input_files: - filename: about-logo(a)2x.png - filename: about-wordmark.png - filename: branding-aboutDialog.css + - filename: updater-text.patch - filename: branding/osx.patch enable: '[% c("var/osx") %]' - filename: bug-1218193.patch diff --git a/projects/instantbird/updater-text.patch b/projects/instantbird/updater-text.patch new file mode 100644 index 0000000..d571511 --- /dev/null +++ b/projects/instantbird/updater-text.patch @@ -0,0 +1,9 @@ +diff --git a/im/locales/en-US/updater/updater.ini b/im/locales/en-US/updater/updater.ini +--- a/im/locales/en-US/updater/updater.ini ++++ b/im/locales/en-US/updater/updater.ini +@@ -5,4 +5,4 @@ + ; This file is in the UTF-8 encoding + [Strings] + Title=Software Update +-Info=Instantbird is installing your updates and will start in a few moments… ++Info=Tor Messenger is installing your updates and will start in a few moments…

1 0

[tor-browser-bundle/hardened-builds] correcting mirror
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit f7fda5e4d6c0cb5147cf4b8629aac1a877ae5bff Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 13:23:20 2016 +0000 correcting mirror --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 4d48089..c663051 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,7 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ -MIRROR_URL_GK=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~gk/mirrors/sources/ set -e set -u umask 0022

1 0

[tor-browser-bundle/hardened-builds] Updating CCTOOLS source url
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit efbddbb105bfc7c3197c8ea79e7039a95a55cfbc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 13:16:01 2016 +0000 Updating CCTOOLS source url --- gitian/fetch-inputs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 1bf69a2..4d48089 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,6 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~asn/mirrors/sources/ set -e set -u umask 0022 @@ -138,6 +139,13 @@ do get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done +for i in CCTOOLS +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_GK}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_GK}${!PACKAGE}" +done + # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. for i in ARGPARSE

1 0