March 2015 - tor-commits - lists.torproject.org

[obfs4/master] Run go fmt
by yawning＠torproject.org 16 Mar '15

16 Mar '15

commit 08647ec58034ecdc4ea60e7eb37c9e91fff784d6 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Mon Mar 16 19:43:02 2015 +0100 Run go fmt --- common/drbg/hash_drbg.go | 2 +- common/ntor/ntor.go | 1 + common/probdist/weighted_dist.go | 2 +- transports/obfs2/obfs2.go | 2 +- transports/obfs3/obfs3.go | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/drbg/hash_drbg.go b/common/drbg/hash_drbg.go index 2cd1ec7..7feb9e8 100644 --- a/common/drbg/hash_drbg.go +++ b/common/drbg/hash_drbg.go @@ -30,8 +30,8 @@ package drbg import ( - "encoding/hex" "encoding/binary" + "encoding/hex" "fmt" "hash" diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go index f17e464..4f6ab27 100644 --- a/common/ntor/ntor.go +++ b/common/ntor/ntor.go @@ -146,6 +146,7 @@ func NodeIDFromHex(encoded string) (*NodeID, error) { return NewNodeID(raw) } + // Bytes returns a pointer to the raw NodeID. func (id *NodeID) Bytes() *[NodeIDLength]byte { return (*[NodeIDLength]byte)(id) diff --git a/common/probdist/weighted_dist.go b/common/probdist/weighted_dist.go index 811a8a0..5f8e88e 100644 --- a/common/probdist/weighted_dist.go +++ b/common/probdist/weighted_dist.go @@ -237,7 +237,7 @@ func (w *WeightedDist) String() string { for i, v := range w.values { p := w.weights[i] if p > 0.01 { // Squelch tiny probabilities. - buf.WriteString(fmt.Sprintf("%d: %f ", v, p)) + buf.WriteString(fmt.Sprintf("%d: %f ", v, p)) } } buf.WriteString("]") diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go index 3490646..ad15671 100644 --- a/transports/obfs2/obfs2.go +++ b/transports/obfs2/obfs2.go @@ -46,7 +46,7 @@ import ( ) const ( - transportName = "obfs2" + transportName = "obfs2" sharedSecretArg = "shared-secret" clientHandshakeTimeout = time.Duration(30) * time.Second diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go index 7844443..dd9281b 100644 --- a/transports/obfs3/obfs3.go +++ b/transports/obfs3/obfs3.go @@ -351,7 +351,6 @@ func (conn *obfs3Conn) Write(b []byte) (n int, err error) { return conn.tx.Write(b) } - var _ base.ClientFactory = (*obfs3ClientFactory)(nil) var _ base.ServerFactory = (*obfs3ServerFactory)(nil) var _ base.Transport = (*Transport)(nil)

1 0

[obfs4/master] Fix all go vet issues
by yawning＠torproject.org 16 Mar '15

16 Mar '15

commit 19dcb424be201c3eb5f204607d46fb78b36105c9 Author: Daniel Martí <mvdan(a)mvdan.cc> Date: Mon Mar 16 19:47:37 2015 +0100 Fix all go vet issues --- transports/obfs2/obfs2.go | 4 ++-- transports/obfs3/obfs3.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go index ad15671..f8efac1 100644 --- a/transports/obfs2/obfs2.go +++ b/transports/obfs2/obfs2.go @@ -235,7 +235,7 @@ func (conn *obfs2Conn) handshake() (err error) { return } txStream := cipher.NewCTR(txBlock, padIV) - conn.tx = &cipher.StreamWriter{txStream, conn.Conn, nil} + conn.tx = &cipher.StreamWriter{S: txStream, W: conn.Conn} if _, err = conn.Conn.Write(seed[:]); err != nil { return } @@ -262,7 +262,7 @@ func (conn *obfs2Conn) handshake() (err error) { return } rxStream := cipher.NewCTR(rxBlock, peerIV) - conn.rx = &cipher.StreamReader{rxStream, conn.Conn} + conn.rx = &cipher.StreamReader{S: rxStream, R: conn.Conn} hsHdr := make([]byte, hsLen) if _, err = io.ReadFull(conn, hsHdr[:]); err != nil { return diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go index dd9281b..53409db 100644 --- a/transports/obfs3/obfs3.go +++ b/transports/obfs3/obfs3.go @@ -261,13 +261,13 @@ func (conn *obfs3Conn) kdf(sharedSecret []byte) (err error) { respStream := cipher.NewCTR(respBlock, respSecret[keyLen:]) if conn.isInitiator { - conn.tx = &cipher.StreamWriter{initStream, conn.Conn, nil} - conn.rx = &cipher.StreamReader{respStream, conn.rxBuf} + conn.tx = &cipher.StreamWriter{S: initStream, W: conn.Conn} + conn.rx = &cipher.StreamReader{S: respStream, R: conn.rxBuf} conn.txMagic = initMagic conn.rxMagic = respMagic } else { - conn.tx = &cipher.StreamWriter{respStream, conn.Conn, nil} - conn.rx = &cipher.StreamReader{initStream, conn.rxBuf} + conn.tx = &cipher.StreamWriter{S: respStream, W: conn.Conn} + conn.rx = &cipher.StreamReader{S: initStream, R: conn.rxBuf} conn.txMagic = respMagic conn.rxMagic = initMagic }

1 0

[obfs4/master] Update the ChangeLog (No functional changes).
by yawning＠torproject.org 16 Mar '15

16 Mar '15

commit 6d1b69d29985acd548895a6057aa755485785f6f Author: Yawning Angel <yawning(a)torproject.org> Date: Mon Mar 16 21:32:17 2015 +0000 Update the ChangeLog (No functional changes). --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index c0c57e3..b5bcb41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Changes in version 0.0.5 - UNRELEASED: + - Go vet/fmt fixes. Patches by mvdan. + Changes in version 0.0.4 - 2015-02-17 - Improve the runtime performance of the obfs4 handshake tests. - Changed the go.crypto import path to the new location (golang.org/x/crypto)

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit 098b92851af9f22ba29c90cb6bee4ea764b0aa2b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 19:15:54 2015 +0000 Update translations for torbutton-branddtd --- bg/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/brand.dtd b/bg/brand.dtd index 83ec7e7..9606bf7 100644 --- a/bg/brand.dtd +++ b/bg/brand.dtd @@ -9,6 +9,6 @@  <!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> +<!ENTITY plugins.installed.enable "Разрешаване на добавките"> <!ENTITY plugins.installed.disable "Disable plugins"> <!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">

1 0

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

16 Mar '15

commit 866128669420528b27bcc9f7ab21259203e7bf10 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 19:15:45 2015 +0000 Update translations for tails-misc --- bg.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bg.po b/bg.po index 41439bb..6253613 100644 --- a/bg.po +++ b/bg.po @@ -4,6 +4,7 @@ # # Translators: # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 # alexdimitrov <kvikmen(a)gmail.com>, 2013 # Mal Malakov <dev(a)epsilon-labs.com>, 2015 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-16 18:54+0000\n" +"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +27,7 @@ msgstr "Tor е готов" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "You can now access the Internet." -msgstr "" +msgstr "Вече може да получите достъп до Интернет." #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -106,7 +107,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:297 #: config/chroot_local-includes/usr/local/bin/gpgApplet:299 msgid "Unknown Trust" -msgstr "" +msgstr "Неизвестен Доверител" #: config/chroot_local-includes/usr/local/bin/gpgApplet:301 msgid "Marginal Trust"

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit efa60c19da3363dc2d606ba80422d15ac9a51ead Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 19:15:40 2015 +0000 Update translations for tor-launcher-network-settings --- bg/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd index 56f17d4..3813505 100644 --- a/bg/network-settings.dtd +++ b/bg/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси.">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit 34a061ad87039992bb911d1d6d45f0ed3cf88b6a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 19:15:27 2015 +0000 Update translations for torbirdy --- bg/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd index eaa719a..92c48c8 100644 --- a/bg/torbirdy.dtd +++ b/bg/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "Отказ"> <!ENTITY torbirdy.prefs.extra2.button "Възстанови стандартните"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.button "Тестване на Прокси настройките"> <!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Прокси"> <!ENTITY torbirdy.prefs.privacy.label "Privacy">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit b6d96e7256277b1c31604a0cc6eff8ff11a58152 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 19:15:07 2015 +0000 Update translations for torcheck --- bg/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bg/torcheck.po b/bg/torcheck.po index 5a4f233..526ecd0 100644 --- a/bg/torcheck.po +++ b/bg/torcheck.po @@ -4,13 +4,14 @@ # Translators: # Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 # Ivo, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-16 18:51+0000\n" +"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgid "" msgstr "Моля, посетете <a href=\"https://www.torproject.org/\">Страницата на Tor</a> за повече информация относно използването на Tor безопасно. Сега можете да сърфирате из интернет Анонимно." msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "Има актуализации по сигурността на TOR браузера" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[webwml/master] fixes incorrect link in torbrowser section of volunteer page. closes #15282
by atagar＠torproject.org 16 Mar '15

16 Mar '15

commit 989fa67b6881bd6421e9971879906f6370b601b2 Author: Irvin Zhan <izhan(a)princeton.edu> Date: Mon Mar 16 00:50:50 2015 -0400 fixes incorrect link in torbrowser section of volunteer page. closes #15282 --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 79f65f4..ddc9203 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -410,7 +410,7 @@ meetings around the world.</li> <a id="project-torbrowser"></a> <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a - href="https://gitweb.torproject.org/torbutton.git">code</a>, <a + href="https://gitweb.torproject.org/torbrowser.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3>

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit 8481710d3082c40f136f21d806a79ca0c69aa462 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 18:45:49 2015 +0000 Update translations for abouttor-homepage_completed --- bg/aboutTor.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd index 6da6157..fa4b18a 100644 --- a/bg/aboutTor.dtd +++ b/bg/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "НО, този браузър не е актуален."> <!ENTITY aboutTor.outOfDateTorOff.label "Също така, този браузър не е актуален."> -<!ENTITY aboutTor.outOfDate2.label "Шракни върху лука и избери Изтегли Обновление за Тор Пакета."> +<!ENTITY aboutTor.outOfDate2.label "Кликнете върху лука(иконката) и след това изберете Проверка за обновяване на Tor браузера"> <!ENTITY aboutTor.check.label "Тествайте мрежовите настройки на Tor"> @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Допълнителна информация:"> <!ENTITY aboutTor.torInfo2.label "Държава и IP адрес:">

1 0