September 2014 - tor-commits - lists.torproject.org

[obfs4/master] Write an example obfs4 bridge line to "obfs4_bridgeline.txt".
by yawning＠torproject.org 24 Sep '14

24 Sep '14

commit 514c3c6053ee3a2d3a842fd59b623ef432d93b7d Author: Yawning Angel <yawning(a)torproject.org> Date: Wed Sep 24 16:00:42 2014 +0000 Write an example obfs4 bridge line to "obfs4_bridgeline.txt". Write an example client bridge line suitable for use with the running obfs4 server instance to "obfs4_bridgeline.txt" for the convenience of bridge operators. --- ChangeLog | 3 +++ doc/obfs4proxy.1 | 9 ++++++++- transports/obfs4/statefile.go | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f91c92..e42ed86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.0.2 - UNRELEASED + - Write an example client bridge line suitable for use with the running obfs4 + server instance to "obfs4_bridgeline.txt" for the convenience of bridge + operators. - Add a man page for obfs4proxy. Changes in version 0.0.1 - 2014-09-03 diff --git a/doc/obfs4proxy.1 b/doc/obfs4proxy.1 index bda677a..e442946 100644 --- a/doc/obfs4proxy.1 +++ b/doc/obfs4proxy.1 @@ -1,4 +1,4 @@ -.TH OBFS4PROXY 1 "2014-09-06" +.TH OBFS4PROXY 1 "2014-09-24" .SH NAME obfs4proxy \- pluggable transport proxy for Tor, implementing obfs4 .SH SYNOPSIS @@ -53,6 +53,13 @@ The Bridge (server) auto-generated obfs4 bridge parameters file. This file will not be created if the administrator specifies them in the \fBtorrc\fR via a \fBServerTransportOptions\fR directive. .RE +.PP +\fIDataDirectory\fR\fB/pt_state/obfs4_bridgeline.txt\fR +.RS 4 +The Bridge (server) obfs4 bridge's client parameters. This file is created +and contains the \fBBridge\fR directive a client should add to their +\fBtorrc\fR to connect to the running server's obfs4 instance. +.RE .SH "CONFORMING TO" Tor Pluggable Transport Specification .SH NOTES diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go index 8690178..1e00f32 100644 --- a/transports/obfs4/statefile.go +++ b/transports/obfs4/statefile.go @@ -42,7 +42,8 @@ import ( ) const ( - stateFile = "obfs4_state.json" + stateFile = "obfs4_state.json" + bridgeFile = "obfs4_bridgeline.txt" ) type jsonServerState struct { @@ -91,10 +92,10 @@ func serverStateFromArgs(stateDir string, args *pt.Args) (*obfs4ServerState, err js.IATMode = iatMode } - return serverStateFromJSONServerState(&js) + return serverStateFromJSONServerState(stateDir, &js) } -func serverStateFromJSONServerState(js *jsonServerState) (*obfs4ServerState, error) { +func serverStateFromJSONServerState(stateDir string, js *jsonServerState) (*obfs4ServerState, error) { var err error st := new(obfs4ServerState) @@ -112,6 +113,11 @@ func serverStateFromJSONServerState(js *jsonServerState) (*obfs4ServerState, err } st.iatMode = js.IATMode + // Generate a human readable summary of the configured endpoint. + if err = newBridgeFile(stateDir, st); err != nil { + return nil, err + } + return st, nil } @@ -170,3 +176,29 @@ func newJSONServerState(stateDir string, js *jsonServerState) (err error) { return nil } + +func newBridgeFile(stateDir string, st *obfs4ServerState) (err error) { + const prefix = "# obfs4 torrc client bridge line\n" + + "#\n" + + "# This file is an automatically generated bridge line based on\n" + + "# the current obfs4proxy configuration. EDITING IT WILL HAVE\n" + + "# NO EFFECT.\n" + + "#\n" + + "# Before distributing this Bridge, edit the placeholder fields\n" + + "# to contain the actual values:\n" + + "# <IP ADDRESS> - The public IP address of your obfs4 bridge.\n" + + "# <PORT> - The TCP/IP port of your obfs4 bridge.\n" + + "# <FINGERPRINT> - The bridge's fingerprint.\n\n" + + bridgeLine := fmt.Sprintf("Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> node-id=%s public-key=%s iat-mode=%d\n", + st.nodeID.Hex(), + st.identityKey.Public().Hex(), + st.iatMode) + + tmp := []byte(prefix + bridgeLine) + if err = ioutil.WriteFile(path.Join(stateDir, bridgeFile), tmp, 0600); err != nil { + return err + } + + return nil +}

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Sep '14

24 Sep '14

commit b37c7628f20529572b05818c11aaf95fbebd1a5e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 24 13:45:45 2014 +0000 Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties index dc239e5..a84139b 100644 --- a/pt_BR/torbutton.properties +++ b/pt_BR/torbutton.properties @@ -14,8 +14,8 @@ torbutton.popup.ff3.warning = Aviso!\n\nO Torbutton no Firefox 3 é conhecido po torbutton.popup.toggle.warning = Você precisa alternar o Tor ou reiniciar para que as suas configurações tenham efeito. torbutton.popup.test.success = O teste de proxy do Tor foi feito com sucesso. torbutton.popup.test.failure = O teste de proxy FALHOU! Verifique o seu proxy e as configurações do Polipo. -torbutton.popup.test.confirm_toggle = O teste mais recente de proxy do Tor falhou ao usar o Tor.\n\nVocê tem certeza de que deseja habilitá-lo assim mesmo?\n\nNota: Se você tiver resolvido o problema, você pode reexecutar o teste na janela de Preferências do Torbutton Proxy para eliminar este aviso. -torbutton.popup.test.ff3_notice = Clique OK para testar as configurações de proxy do Tor. Este teste acontecerá no segundo plano. Por favor, seja paciente. +torbutton.popup.test.confirm_toggle = O teste mais recente de proxy do Tor falhou ao usá-lo.\n\nVocê tem certeza de que deseja habilitar o proxy assim mesmo?\n\nNota: Se você tiver resolvido o problema, reexecute o teste na janela de Preferências do Torbutton Proxy para eliminar este aviso. +torbutton.popup.test.ff3_notice = Clique em OK para testar as configurações de proxy do Tor. Este teste acontecerá em segundo plano. Por favor, seja paciente. torbutton.panel.label.verified = O Tor foi verificado torbutton.popup.test.auto_failed = O teste automático de proxy do Tor falhou ao usar o Tor.\n\nVocê tem certeza que deseja habilitá-lo assim mesmo? torbutton.prefs.recommended = (recomendado) @@ -28,23 +28,23 @@ torbutton.popup.external.suggest = Para sua segurança, você só deve abrir arq torbutton.popup.launch = Fazer o download do arquivo torbutton.popup.cancel = Cancelar torbutton.popup.dontask = Fazer o download dos arquivos automaticamente de agora em diante -torbutton.popup.test.no_http_proxy = Teste de proxy do Tor: O Proxy do HTTP está inacessível. Será que o Polipo está funcionando devidamente? +torbutton.popup.test.no_http_proxy = Teste de proxy do Tor: O Proxy do HTTP local encontra-se inacessível. Será que o Polipo está funcionando devidamente? torbutton.popup.captcha.title = Evitar as Captchas do Google? torbutton.popup.captcha.ask = O Torbuttor detectou uma Captcha do Google. Você gostaria de ser redirecionado para outro site de pesquisa para esta consulta? torbutton.popup.captcha.always = Sempre realizar esta ação de agora em diante torbutton.popup.redirect = Redirecionar torbutton.popup.no_redirect = Não redirecionar -torbutton.popup.prompted_language = Para lhe proporcionar mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês. +torbutton.popup.prompted_language = Para proporcionar-lhe mais privacidade, o Torbutton pode requisitar a versão em inglês das páginas da web. Isso pode fazer com que as páginas que você prefere ler na sua língua nativa apareçam em Inglês. torbutton.popup.no_newnym = O Torbutton não pode dar-lhe uma nova identidade com segurança. Ele não tem acesso à Porta de Controle do Tor.\n\nVocê está usando o Pacote do Navegador Tor? torbutton.popup.use_tbb = Parece que você está usando o Torbutton com o Firefox, o que não é uma configuração segura e recomendada.\n\nEm vez disso, recomendamos que você obtenha a versão mais recente do Pacote do Navegador Tor, enviando um e-mail para <a href="mailto:gettor@torproject.org">gettor(a)torproject.org</a> ou fazendo o download no seguinte endereço: -torbutton.popup.pref_error = O Torbutton não pode atualizar as preferências na pasta de perfil do Navegador Tor. -torbutton.popup.permission_denied = Por favor, restaure as permissões na pasta do Navegador Tor ou as copie para um outro lugar. -torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere mais espaço ou mova o Navegador Tor para um novo dispositivo. +torbutton.popup.pref_error = O Torbutton não consegue atualizar as preferências na pasta de perfil do Navegador Tor. +torbutton.popup.permission_denied = Por favor, restaure as permissões na pasta do Navegador Tor ou copie-as em um outro lugar. +torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere mais espaço ou mova o Navegador Tor em um outro dispositivo. torbutton.title.prompt_torbrowser = Informação importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de forma diferente: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos erros lá, bugs, que não poderiam ser resolvidos de outra maneira.\n\nSe você quiser continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá para as Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações. -torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nEles também podem ignorar o Tor e revelar a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n +torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nPode ser ainda que eles ignorem o Tor e revelem a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n torbutton.popup.never_ask_again = Não me pergunte novamente # Canvas permission prompt. Strings are kept here for ease of translation.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Sep '14

24 Sep '14

commit d1b197803dd7a07737493427ee63b97d75b54256 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 24 13:15:22 2014 +0000 Update translations for https_everywhere_completed --- de/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index b1da3c0..f624ecb 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -36,7 +36,7 @@ <!ENTITY https-everywhere.source.unable_to_download "Quelle konnte nicht heruntergeladen werden."> <!ENTITY https-everywhere.popup.title "Nachricht von HTTPS-Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Ups. Sie haben die stabile Version von HTTPS-Everywhere benutzt, aber wir haben Sie möglicherweise in unserer letzten Aktualisierung auf eine Entwicklerversion aktualisiert."> +<!ENTITY https-everywhere.popup.paragraph1 "Huch. Sie haben die stabile Version von HTTPS-Everywhere benutzt, aber wir haben Sie möglicherweise in unserer letzten Aktualisierung auf eine Entwicklerversion aktualisiert."> <!ENTITY https-everywhere.popup.paragraph2 "Möchten Sie zurück zur stabilen Version?"> <!ENTITY https-everywhere.popup.paragraph3 "Wir würden uns freuen, wenn Sie weiterhin die Entwicklerversion benutzen würden, um uns zu helfen HTTPS-Everywhere zu verbessern! Es könnte sein, dass Sie hier und da einige Fehler finden, welche Sie an https-everywhere(a)eff.org melden können. Entschuldigen Sie die Unannehmlichkeit und danke, dass Sie HTTPS-Everywhere benutzen."> <!ENTITY https-everywhere.popup.keep "Entwicklerversion beibehalten.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Sep '14

24 Sep '14

commit 1b27b65b97692bfcb82c5e24a18759ba9abff03a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 24 13:15:18 2014 +0000 Update translations for https_everywhere --- de/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index b1da3c0..f624ecb 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -36,7 +36,7 @@ <!ENTITY https-everywhere.source.unable_to_download "Quelle konnte nicht heruntergeladen werden."> <!ENTITY https-everywhere.popup.title "Nachricht von HTTPS-Everywhere 4.0development.11"> -<!ENTITY https-everywhere.popup.paragraph1 "Ups. Sie haben die stabile Version von HTTPS-Everywhere benutzt, aber wir haben Sie möglicherweise in unserer letzten Aktualisierung auf eine Entwicklerversion aktualisiert."> +<!ENTITY https-everywhere.popup.paragraph1 "Huch. Sie haben die stabile Version von HTTPS-Everywhere benutzt, aber wir haben Sie möglicherweise in unserer letzten Aktualisierung auf eine Entwicklerversion aktualisiert."> <!ENTITY https-everywhere.popup.paragraph2 "Möchten Sie zurück zur stabilen Version?"> <!ENTITY https-everywhere.popup.paragraph3 "Wir würden uns freuen, wenn Sie weiterhin die Entwicklerversion benutzen würden, um uns zu helfen HTTPS-Everywhere zu verbessern! Es könnte sein, dass Sie hier und da einige Fehler finden, welche Sie an https-everywhere(a)eff.org melden können. Entschuldigen Sie die Unannehmlichkeit und danke, dass Sie HTTPS-Everywhere benutzen."> <!ENTITY https-everywhere.popup.keep "Entwicklerversion beibehalten.">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 24 Sep '14

24 Sep '14

commit 6fad0b25dc8f69927edb468ffc9a681f12369cc8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 24 13:15:12 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 9cfdef3..fcb7302 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-20 09:10+0000\n" -"Last-Translator: gerhard <listmember(a)rinnberger.de>\n" +"PO-Revision-Date: 2014-09-24 13:13+0000\n" +"Last-Translator: Tobias Bannert\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +71,7 @@ msgid "This page is also available in the following languages:" msgstr "Diese Seite ist auch in folgenden Sprachen verfügbar:" msgid "For more information about this exit relay, see:" -msgstr "Weitere Informationen zu diesen Ausgangrelais:" +msgstr "Weitere Informationen zu diesem Ausgangsrelais:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 24 Sep '14

24 Sep '14

commit 5868c917eb88217f8712c31330b84d8177135502 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 24 13:15:09 2014 +0000 Update translations for torcheck --- de/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 9cfdef3..fcb7302 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-20 09:10+0000\n" -"Last-Translator: gerhard <listmember(a)rinnberger.de>\n" +"PO-Revision-Date: 2014-09-24 13:13+0000\n" +"Last-Translator: Tobias Bannert\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +71,7 @@ msgid "This page is also available in the following languages:" msgstr "Diese Seite ist auch in folgenden Sprachen verfügbar:" msgid "For more information about this exit relay, see:" -msgstr "Weitere Informationen zu diesen Ausgangrelais:" +msgstr "Weitere Informationen zu diesem Ausgangsrelais:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "

1 0

[tor-browser-bundle/master] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 72ec0faa93ceb840a897e2e6953334ced2a8ff7b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:03:46 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index be1283f..c4938d0 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 286f860..d71c824 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -89,7 +89,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 520119b..d7fc722 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -82,7 +82,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index eb368a9..2c60e6e 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/maint-3.6] Use the commit for Tor Launcher as well.
by gk＠torproject.org 24 Sep '14

24 Sep '14

commit 4fd2bc0dda2c3c510f8062d3420e9a3c8f6e94fc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 24 15:00:03 2014 +0000 Use the commit for Tor Launcher as well. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index cdaf51d..e4a428b 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -84,7 +84,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3cd137b..c3dfb83 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -91,7 +91,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e582d17..4d24561 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -86,7 +86,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 29f1e34..8778eca 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -37,7 +37,7 @@ then # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG #GITIAN_TAG=refs/tags/$GITIAN_TAG - TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG + #TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG

1 0

[tor-browser-bundle/maint-3.6] Also switch gitian to commit hash.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 54b54404bebf330a2addd7fc77730326fe6de756 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 02:26:42 2014 -0700 Also switch gitian to commit hash. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- gitian/versions | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index ea6d171..cdaf51d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -83,7 +83,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e852989..3cd137b 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -90,7 +90,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index ecabeae..e582d17 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -85,7 +85,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 7531589..29f1e34 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -36,7 +36,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8aa818e..36269f3 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -144,6 +144,6 @@ done cd "$INPUTS_DIR" -verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" +#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG" diff --git a/gitian/versions b/gitian/versions index 7c38d91..a52facf 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Also switch gitian to commit hash.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 4d5787fb137e5275c5c23588caa1956770f3c67e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 02:28:08 2014 -0700 Also switch gitian to commit hash. --- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index e3b145d..be1283f 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -83,7 +83,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 9e8ec7c..286f860 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -88,7 +88,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 595ff29..520119b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -81,7 +81,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index afcd70d..eb368a9 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -35,7 +35,7 @@ then # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG - GITIAN_TAG=refs/tags/$GITIAN_TAG + #GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5b1a304..97bc56e 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,6 +147,6 @@ done cd "$INPUTS_DIR" -verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" +#verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 20e38f8..ccfb542 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.11 -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=ae72871ea2e1c731ee34bba27a47fcce1b79786e #tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0