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

[webwml/master] Update versions on website
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit b1b0515e1ec365202b38422dddcb22350f7ab637 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:19:54 2014 -0400 Update versions on website --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 51f8f77..c22a34a 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.2.4.24 -export DEVTAG=tor-0.2.5.8-rc +export STABLETAG=tor-0.2.4.25 +export DEVTAG=tor-0.2.5.9-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index e5772b9..f044790 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.2.4.24</define-tag> -<define-tag version-alpha whitespace=delete>0.2.5.8-rc</define-tag> +<define-tag version-stable whitespace=delete>0.2.4.25</define-tag> +<define-tag version-alpha whitespace=delete>0.2.5.9-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.4.23</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.23</define-tag>

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 20 Oct '14

20 Oct '14

commit daf01272a9d6027e8e295e5778adbfd8ba8a448f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 20 15:16:12 2014 +0000 Update translations for tor-launcher-network-settings_completed --- eu/network-settings.dtd | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index ffcc105..aab8b06 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Tor Browser Bundleak Tor sarera konektatzen saiatu baino lehen, ordenagailu honen Interneteko konexioaren inguruko informazioa eman beharko duzu."> +<!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu."> <!ENTITY torSettings.yes "Bai"> <!ENTITY torSettings.no "Ez"> <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> -<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta, iragazita, edo proxyatuta dago."> -<!ENTITY torSettings.configurePrompt2 "Zubi, sueten, edo proxy ezarpenak konfiguratu behar ditut."> +<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> @@ -19,15 +19,14 @@  <!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> -<!ENTITY torSettings.firewallQuestion "Ordenagailu honen Interneteko konexioa ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar al doa?"> -<!ENTITY torSettings.firewallHelp "Galdera hau nola erantzuteaz zalantzan bazaude, hautatu Ez. Tor sarera konektatzen arazoak aurkitzen badituzu, aldatu ezarpen hau."> -<!ENTITY torSettings.enterFirewall "Suetenak baimendutako eta komaz banandutako ataka zerrenda bat sar ezazu "> -<!ENTITY torSettings.bridgeQuestion "Ordenagailu honen Interneteko konexioa zentsuratuta badago, zubi erreleak lortu eta erabili beharko dituzu.&#160; Bestela, sakatu Konektatu besterik gabe."> +<!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> +<!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> +<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu.">  <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten..."> -<!ENTITY torsettings.restart "Berrabiarazi"> +<!ENTITY torsettings.restartTor "Tor berrabiarazi"> <!ENTITY torsettings.optional "Hautazkoa"> @@ -44,16 +43,20 @@ <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa"> <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> <!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit."> +<!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu"> +<!ENTITY torsettings.useBridges.type "Garraio mota:"> +<!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak"> <!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko)."> -<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka EDO garraio helbidea:ataka"> +<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka"> <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> -<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.&#160; Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "Hemen dituzu zubi helbideak eskuratzeko hiru bide:"> +<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> +<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: "> <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> -<!ENTITY torsettings.bridgeHelp3 "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.&#160; Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu: gmail.com edo yahoo.com."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.  Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu (lehentasunaren arabera zerrendatuta):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> -<!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.&#160; Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> +<!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 20 Oct '14

20 Oct '14

commit c7d99a9c7b969624652bcdebeb3bf2393cf05cbd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 20 15:16:07 2014 +0000 Update translations for tor-launcher-network-settings --- eu/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index 074af53..aab8b06 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -21,7 +21,7 @@ <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> <!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> <!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> -<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi paketea erabili dezakezu edo zubi pakete pertsonalizatua eskuratu eta sar dezakezu."> +<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu.">  @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.  Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu (lehentasunaren arabera zerrendatuta):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela.">

1 0

[tor/master] Memwipe more keys after tor has finished with them
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit 2e1f5c1fc0f6239a8bb9f409f1f170fb21ce1a37 Author: teor <teor2345(a)gmail.com> Date: Mon Oct 20 03:06:28 2014 +1100 Memwipe more keys after tor has finished with them Ensure we securely wipe keys from memory after crypto_digest_get_digest and init_curve25519_keypair_from_file have finished using them. Fixes bug 13477. --- changes/bug13477-memwipe-more-keys | 5 +++++ src/common/crypto.c | 2 +- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug13477-memwipe-more-keys b/changes/bug13477-memwipe-more-keys new file mode 100644 index 0000000..cf8e0a9 --- /dev/null +++ b/changes/bug13477-memwipe-more-keys @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Ensure we securely wipe keys from memory after + crypto_digest_get_digest and init_curve25519_keypair_from_file + have finished using them. + Fixes bug 13477. diff --git a/src/common/crypto.c b/src/common/crypto.c index f128336..58f20ae 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1684,7 +1684,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, log_warn(LD_BUG, "Called with unknown algorithm %d", digest->algorithm); /* If fragile_assert is not enabled, then we should at least not * leak anything. */ - memset(r, 0xff, sizeof(r)); + memwipe(r, 0xff, sizeof(r)); tor_fragile_assert(); break; } diff --git a/src/or/router.c b/src/or/router.c index 5d1d2ff..bbbf9c4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -488,7 +488,7 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out, if (curve25519_keypair_write_to_file(keys_out, fname, tag)<0) { tor_log(severity, LD_FS, "Couldn't write generated key to \"%s\".", fname); - memset(keys_out, 0, sizeof(*keys_out)); + memwipe(keys_out, 0, sizeof(*keys_out)); goto error; } } else {

1 0

[tor/master] Merge remote-tracking branch 'teor/memwipe-more-keys'
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e3d166b7a63b4f0c248e20b759dba2ccb8d30092 Merge: d6fab2a 2e1f5c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 11:12:51 2014 -0400 Merge remote-tracking branch 'teor/memwipe-more-keys' changes/bug13477-memwipe-more-keys | 5 +++++ src/common/crypto.c | 2 +- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 20 Oct '14

20 Oct '14

commit 1ed89f6cfbb9ae537efb1bca8cbf380190c8fc7f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 20 14:46:15 2014 +0000 Update translations for tails-misc --- sl_SI.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sl_SI.po b/sl_SI.po index 0e69f77..90184b1 100644 --- a/sl_SI.po +++ b/sl_SI.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-10-20 14:16+0000\n" +"PO-Revision-Date: 2014-10-20 14:41+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n" @@ -166,75 +166,75 @@ msgstr[3] "Ali dovolj zaupate tem ključem, da jih vseeno uporabite?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" -msgstr "" +msgstr "Ključ ni izbran" #: config/chroot_local-includes/usr/local/bin/gpgApplet:584 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "" +msgstr "Izbrati morate zasebni ključ za podpisovanje sporočila, ali kateri javni ključi za šifriranje sporočila, ali pa oboje." #: config/chroot_local-includes/usr/local/bin/gpgApplet:612 msgid "No keys available" -msgstr "" +msgstr "Ni uporabnega ključa" #: config/chroot_local-includes/usr/local/bin/gpgApplet:614 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "" +msgstr "Rabite zasebni ključ za podpis sporočila ali javni ključ za šifriranje le tega." #: config/chroot_local-includes/usr/local/bin/gpgApplet:742 msgid "GnuPG error" -msgstr "" +msgstr "GnuPG napaka" #: config/chroot_local-includes/usr/local/bin/gpgApplet:763 msgid "Therefore the operation cannot be performed." -msgstr "" +msgstr "Zato ni mogoče izvesti operacijo." #: config/chroot_local-includes/usr/local/bin/gpgApplet:813 msgid "GnuPG results" -msgstr "" +msgstr "GnuPG rezultati" #: config/chroot_local-includes/usr/local/bin/gpgApplet:819 msgid "Output of GnuPG:" -msgstr "" +msgstr "Izhod iz GnuPG:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "Druga sporočila ponujena od GnuPG:" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "" +msgstr "Nemudoma Ugasni" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "" +msgstr "Nemudoma znova zaženi" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" -msgstr "" +msgstr "ni primeren" #: config/chroot_local-includes/usr/local/bin/tails-about:19 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 msgid "Tails" -msgstr "" +msgstr "Sledi" #: config/chroot_local-includes/usr/local/bin/tails-about:24 msgid "The Amnesic Incognito Live System" -msgstr "" +msgstr "aktivni sistem The Amnesic Incognito" #: config/chroot_local-includes/usr/local/bin/tails-about:25 #, python-format msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Oblikuje informacije\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:27 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1 msgid "About Tails" -msgstr "" +msgstr "Vizitka Sledi" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 20 Oct '14

20 Oct '14

commit 13613adf13e9aac219e955c200e4ae92c2c9fb69 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 20 14:46:06 2014 +0000 Update translations for tor-launcher-network-settings --- eu/network-settings.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd index 3e90c07..074af53 100644 --- a/eu/network-settings.dtd +++ b/eu/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu."> <!ENTITY torSettings.yes "Bai"> <!ENTITY torSettings.no "Ez"> <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> @@ -19,9 +19,9 @@  <!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> +<!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> +<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi paketea erabili dezakezu edo zubi pakete pertsonalizatua eskuratu eta sar dezakezu.">  @@ -43,16 +43,16 @@ <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa"> <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> <!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu"> +<!ENTITY torsettings.useBridges.type "Garraio mota:"> +<!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak"> <!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka"> <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> <!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: "> <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez">

1 0

[tor/master] bump maint-0.2.4 to 0.2.4.25-dev
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit e2112dd0c021fb620e90dbef3456f96635982cfc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:24:21 2014 -0400 bump maint-0.2.4 to 0.2.4.25-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3456013..9cf172a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.23]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE

1 0

[tor/master] Whoops, bump the version properly.
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit fed78bce8bc645866578a1739a10ee598bbaf4e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:29:16 2014 -0400 Whoops, bump the version properly. --- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 23a01b4..1e578cd 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.23" +!define VERSION "0.2.4.25-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c86e2b0..d3f3eb1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.23" +#define VERSION "0.2.4.25-dev"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 20 Oct '14

20 Oct '14

commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17 Merge: fd8f21e fed78bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 20 10:31:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

1 0