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

[atlas/master] Adds links to descriptors on details page (Fixes: #25239)
by irl＠torproject.org 22 Mar '18

22 Mar '18

commit 2c383c653101777220bd888600ce7abecb715a61 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 21 14:24:42 2018 +0000 Adds links to descriptors on details page (Fixes: #25239) --- templates/details/router.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/templates/details/router.html b/templates/details/router.html index 3b66315..b523ff4 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -286,6 +286,17 @@ </div> </div> +<% if (relay.get('dir_address')) { %> +<h3>Advanced</h3> +<p> +<a href="http://<%= relay.get('dir_address') %>/tor/server/authority" + class="btn btn-info">Latest server descriptor</a> + +<a href="http://<%= relay.get('dir_address') %>/tor/extra/authority" + class="btn btn-info">Latest extra-info descriptor</a> +</p> +<% } %> + </div> <p>Information for relays was published: <%= relay.get('relaysPublished') %> UTC.</p>

1 0

[atlas/master] Rewords outdated relay warning message (Fixes: #25558)
by irl＠torproject.org 22 Mar '18

22 Mar '18

commit b6e6c3235806c9d1521dbc2c08cecee626466928 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Mar 21 13:44:49 2018 +0000 Rewords outdated relay warning message (Fixes: #25558) --- templates/details/router.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index b523ff4..97c7aac 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -11,7 +11,12 @@ <div class="alert alert-info">This relay appears to be less than 2 weeks old. <a href="https://blog.torproject.org/lifecycle-new-relay">This blog post</a> explains the lifecycle of a new relay, and why it will not be immediately fully used to capacity.</div> <% } %> <% if (relay.get('recommended_version') === false && relay.get('version_consistent') == true) { %> -<div class="alert alert-danger">This relay is running an outdated Tor version and should be updated to a recent release of Tor that may contain important fixes.</div> +<div class="alert alert-danger">This relay is running a version of Tor that is not recommended. +It is most likely too old and may be missing important security fixes. If +this is the case, and this is your relay, you should update it as soon as +possible. Development versions (versions that are too new) will also trigger +this warning message (see bug <a +href="https://bugs.torproject.org/24256">#24256</a>).</div> <% } %> <div class="row"> <div class="col-md-6">

1 0

[tor-browser-build/master] Bug 25579: Bump snowflake/go-webrtc again for trac 21312.
by gk＠torproject.org 22 Mar '18

22 Mar '18

commit 0679737202b5a7343314e0ef7f3aa1fefa5cbd6d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 20 19:33:25 2018 -0700 Bug 25579: Bump snowflake/go-webrtc again for trac 21312. Commit 42720c512520ecef5437d23e405d8ce011764661 fixed a memory/file descriptor leak in snowflake-client. Further work on ticket #21312 uncovered crashes in the snowflake WebRTC server and proxy (comments 29 and following). While we didn't observe the same kind of crashes in snowflake-client, this revision applies the same synchronization around WebRTC channel destruction as in the server and proxy. --- projects/go-webrtc/config | 2 +- projects/snowflake/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index bcfaffa..65be36f 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: 62dbae8e3b7e7db076e079a7437166966c747033 +git_hash: 90ac15ae07cc6e820cd922a239dd892598986622 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/snowflake/config b/projects/snowflake/config index d28f8b2..8e3296c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: d0686b1c8df037413f32bef891ef90638b75a080 +git_hash: 1114acbcb4acb82174b293983ced8afcaf9e2a93 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 Mar '18

22 Mar '18

commit 1b997bd61c81189a0e0e55dd395f583a884c45cb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 22 00:16:47 2018 +0000 Update translations for tails-misc_completed --- da.po | 148 +++++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 97 insertions(+), 51 deletions(-) diff --git a/da.po b/da.po index 57807a261..c39355849 100644 --- a/da.po +++ b/da.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2018-02-04 21:54+0000\n" +"POT-Creation-Date: 2018-03-12 19:03+0100\n" +"PO-Revision-Date: 2018-03-22 00:15+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -55,36 +55,40 @@ msgid "" "</p>\n" msgstr "<h1>Hjælp os med at fikse din bug!</h1>\n<p>Læs <a href=\"%s\">vores bug rapporteringsinstrukser</a>.</p>\n<p><strong>Inkludér ikke mere personlig information end\nbehøvet!</strong></p>\n<h2>Vedrørende at give os en mailadresse</h2>\n<p>\nVed at give os en mailadresse tillader du os at kontakte dig for at undersøge problemet. Dette\ner nødvendigt for størstedelen af indsendte rapporter vi modtager, idet de fleste rapporter\nuden nogen kontaktinformation er ubrugelige. På den anden side åbner det dog også\nen mulighed for mellemmænd, såsom din e-mail- eller internetudbyder, for at\nbekræfte at du bruger Tails.\n</p>\n" -#: config/chroot_local-includes/usr/local/bin/electrum:17 +#: config/chroot_local-includes/usr/local/bin/electrum:57 msgid "Persistence is disabled for Electrum" msgstr "Vedholdenhed er deaktiveret for Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:19 +#: config/chroot_local-includes/usr/local/bin/electrum:59 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Når du genstarter Tails vil alle Electrums data blive tabt, inklusiv din Bitcoin pung. Det anbefales stærkt at du kun kører Electrum når vedholdende-funktionaliteten er aktiveret." -#: config/chroot_local-includes/usr/local/bin/electrum:21 +#: config/chroot_local-includes/usr/local/bin/electrum:60 msgid "Do you want to start Electrum anyway?" msgstr "Vil du starte Electrum alligevel?" -#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/electrum:63 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Start" -#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/electrum:64 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Afslut" -#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart" msgstr "Genstart" -#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:78 +msgid "Lock screen" +msgstr "Lås skærm" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:81 msgid "Power Off" msgstr "Luk ned" @@ -113,24 +117,51 @@ msgstr "Byggeinformation:\n%s" msgid "not available" msgstr "ikke tilgængelig" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:162 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:166 -msgid "Your additional software" -msgstr "Dine yderligere programmer" +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170 +msgid "Your additional software installation failed" +msgstr "Din yderligere software installation mislykkedes" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:167 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171 +msgid "" +"The installation failed. Please check your additional software " +"configuration, or read the system log to understand better the problem." +msgstr "Din installation mislykkedes. Tjek venligst din yderligere software-konfiguration, eller læs systemloggen for bedre at forstå problemet." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:177 +msgid "Your additional software are installed" +msgstr "Din yderligere software er installeret" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:178 +msgid "Your additional software are ready to use." +msgstr "Din yderligere software er klar til brug." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:194 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:204 +msgid "Your additional software upgrade failed" +msgstr "Din yderligere software opgradering mislykkedes" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:195 +msgid "" +"The check for upgrades failed. This might be due to a network problem. " +"Please check your network connection, try to restart Tails, or read the " +"system log to understand better the problem." +msgstr "Søgningen efter opgraderinger mislykkedes. Det kan være pga. et netværksproblem. Tjek venligst din netværksforbindelse, prøv at genstarte Tails, eller læs systemloggen for bedre at forstå problemet." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201 +msgid "Your additional software are up to date" +msgstr "Din yderligere software er opdateret" + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:202 +msgid "The upgrade was successful." +msgstr "Opgraderingen lykkedes." + +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:205 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "Opgraderingen fejlede. Dette kan skyldes et netværksproblem. Kontroller venligst din netværksforbindelse, prøv at genstarte Tails, eller læs systemets log for bedre at forstå problemet." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:163 -msgid "The upgrade was successful." -msgstr "Opgraderingen lykkedes." - #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "Synkroniserer systemets ur" @@ -176,19 +207,34 @@ msgid "" "You might prefer to restart Tails and disable MAC spoofing." msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). Fejlretning fejlede også, så al netværk er slået fra. \nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 -msgid "error:" -msgstr "fejl:" +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 +msgid "Lock Screen" +msgstr "Lås skærm" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 -msgid "Error" -msgstr "Fejl" +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 +#: config/chroot_local-includes/usr/local/bin/tor-browser:46 +msgid "Cancel" +msgstr "Annuller" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 +msgid "Screen Locker" +msgstr "Skærmlåser" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 +msgid "Set up a password to unlock the screen." +msgstr "Opsæt en adgangskode til at låse skærmen op." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 +msgid "Password" +msgstr "Adgangskode" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141 +msgid "Confirm" +msgstr "Bekræft" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35 msgid "" -"<b>Not enough memory available to check for upgrades.</b>\n" +"\"<b>Not enough memory available to check for upgrades.</b>\n" "\n" "Make sure this system satisfies the requirements for running Tails.\n" "See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" @@ -196,8 +242,18 @@ msgid "" "Try to restart Tails to check for upgrades again.\n" "\n" "Or do a manual upgrade.\n" -"See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Der er ikke nok hukommelse tilgængelig til at søge efter opgraderinger.</b>\n\nSørg for at dette system opfylder kravene til at køre Tails. \nSe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPrøv at genstarte Tails for at søge efter opgraderinger igen.\n\nEller foretag en manuel opgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual" +"See https://tails.boum.org/doc/first_steps/upgrade#manual\"" +msgstr "\"<b>Der er ikke nok ledig hukommelse til at søge efter opgraderinger.</b>\n\nSørg for at systemet lever op til kravene for at køre Tails.\nSe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPrøv at genstarte Tails for at søge efter opgraderinger igen.\n\nEller foretag en manuel opgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual\"" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 +msgid "error:" +msgstr "fejl:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 +msgid "Error" +msgstr "Fejl" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71 msgid "Warning: virtual machine detected!" @@ -237,10 +293,6 @@ msgstr "Tor er ikke klar. Start Tor Browser alligevel?" msgid "Start Tor Browser" msgstr "Start Tor Browser" -#: config/chroot_local-includes/usr/local/bin/tor-browser:46 -msgid "Cancel" -msgstr "Annuller" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Er du sikker på at du vil starte den usikre browser?" @@ -285,27 +337,21 @@ msgid "" "retry in a while." msgstr "En anden Usikker Browser kører eller ryddes op. Prøv igen om et kort stykke tid." -#: 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 sendte os dårlige data i forsøget på at fjerne clearnet DNS-serveren." - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114 -msgid "" -"No DNS server was obtained through DHCP or manually configured in " -"NetworkManager." -msgstr "Ingen DNS-server blev fundet gennem DHCP eller den manuelle konfiguration i netværkshåndtering." - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:122 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:100 msgid "Failed to setup chroot." msgstr "Kunne ikke indstille chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:128 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 msgid "Failed to configure browser." msgstr "Fejlede i konfigurationen af browseren." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:133 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:111 +msgid "" +"No DNS server was obtained through DHCP or manually configured in " +"NetworkManager." +msgstr "Ingen DNS-server blev fundet gennem DHCP eller den manuelle konfiguration i netværkshåndtering." + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:117 msgid "Failed to run browser." msgstr "Kørslen af browseren fejlede."

1 0

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

22 Mar '18

commit e9317ea5baf0dbdc8f6ff35039be1ad15106a3c3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 22 00:16:42 2018 +0000 Update translations for tails-misc --- da.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/da.po b/da.po index 29169cd46..c39355849 100644 --- a/da.po +++ b/da.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 02:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-03-22 00:15+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +86,7 @@ msgstr "Genstart" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:78 msgid "Lock screen" -msgstr "" +msgstr "Lås skærm" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:81 msgid "Power Off" @@ -145,7 +145,7 @@ msgid "" "The check for upgrades failed. This might be due to a network problem. " "Please check your network connection, try to restart Tails, or read the " "system log to understand better the problem." -msgstr "" +msgstr "Søgningen efter opgraderinger mislykkedes. Det kan være pga. et netværksproblem. Tjek venligst din netværksforbindelse, prøv at genstarte Tails, eller læs systemloggen for bedre at forstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201 msgid "Your additional software are up to date" @@ -209,7 +209,7 @@ msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). Fejlretni #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 msgid "Lock Screen" -msgstr "" +msgstr "Lås skærm" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 @@ -218,11 +218,11 @@ msgstr "Annuller" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 msgid "Screen Locker" -msgstr "" +msgstr "Skærmlåser" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 msgid "Set up a password to unlock the screen." -msgstr "" +msgstr "Opsæt en adgangskode til at låse skærmen op." #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password" @@ -243,7 +243,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual\"" -msgstr "" +msgstr "\"<b>Der er ikke nok ledig hukommelse til at søge efter opgraderinger.</b>\n\nSørg for at systemet lever op til kravene for at køre Tails.\nSe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPrøv at genstarte Tails for at søge efter opgraderinger igen.\n\nEller foretag en manuel opgradering.\nSe https://tails.boum.org/doc/first_steps/upgrade#manual\"" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 22 Mar '18

22 Mar '18

commit b68a0e00d845eeb730bee6492f05e2697e19c199 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 22 00:16:22 2018 +0000 Update translations for tor-launcher-properties_completed --- da/torlauncher.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index abdc6a5f3..daa46511e 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -26,11 +26,21 @@ torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller vært torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. +torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. torlauncher.bridge_suffix.meek-amazon=(virker i kina) torlauncher.bridge_suffix.meek-azure=(virker i kina) +torlauncher.request_a_bridge=Anmod om en bro… +torlauncher.request_a_new_bridge=Anmod om en ny bro… +torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vent venligst. +torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. +torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. +torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S +torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. +torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. + torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor torlauncher.quit=Afslut @@ -62,3 +72,7 @@ torlauncher.bootstrapWarning.timeout=forbindelse timeout torlauncher.bootstrapWarning.noroute=ingen rute til vært torlauncher.bootstrapWarning.ioerror=læse/skrive fejl torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport + +torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 22 Mar '18

22 Mar '18

commit 3518e2d97a46557e9b74b4262259bf0ed42cdf49 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 22 00:16:17 2018 +0000 Update translations for tor-launcher-properties --- da/torlauncher.properties | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/da/torlauncher.properties b/da/torlauncher.properties index 890073169..daa46511e 100644 --- a/da/torlauncher.properties +++ b/da/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller vært torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. torlauncher.bridge_suffix.meek-amazon=(virker i kina) torlauncher.bridge_suffix.meek-azure=(virker i kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Anmod om en bro… +torlauncher.request_a_new_bridge=Anmod om en ny bro… +torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vent venligst. +torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. +torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. +torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S +torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. +torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ingen rute til vært torlauncher.bootstrapWarning.ioerror=læse/skrive fejl torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen.

1 0

[tor/maint-0.3.3] Update src/ext/rust to latest master for libc update.
by nickm＠torproject.org 21 Mar '18

21 Mar '18

commit 2b3138741002e298ee9b6a0fb8150432bfdcb0fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 21 17:09:59 2018 -0400 Update src/ext/rust to latest master for libc update. --- src/ext/rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/rust b/src/ext/rust index 2422d7acc..fbc0c2578 160000 --- a/src/ext/rust +++ b/src/ext/rust @@ -1 +1 @@ -Subproject commit 2422d7acccc44c633ea825b630ceee6777773cc2 +Subproject commit fbc0c25785696a25b9cbc09ed645cc8d404ee0f6

1 0

[tor/maint-0.3.3] Merge branch 'bug25310_r1_033' into maint-0.3.3
by nickm＠torproject.org 21 Mar '18

21 Mar '18

commit 95b78d4178a07b9b33782a2d3193aa176a88ca80 Merge: b06997914 00a473733 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 21 17:04:38 2018 -0400 Merge branch 'bug25310_r1_033' into maint-0.3.3 doc/HACKING/CodingStandardsRust.md | 36 ++++++++++++++++++++++++++ scripts/maint/updateRustDependencies.sh | 45 +++++++++++++++++++++++++++++++++ src/ext/rust | 2 +- src/rust/Cargo.lock | 28 ++++++++++---------- src/rust/external/Cargo.toml | 2 +- src/rust/protover/Cargo.toml | 2 +- src/rust/smartlist/Cargo.toml | 2 +- src/rust/tor_allocate/Cargo.toml | 2 +- src/rust/tor_util/Cargo.toml | 2 +- 9 files changed, 101 insertions(+), 20 deletions(-)

1 0

[tor/maint-0.3.3] maint: Add script for vendoring/updating Rust dependencies.
by nickm＠torproject.org 21 Mar '18

21 Mar '18

commit 97993943755fb1670fca6d216565adb69db2687b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 14 21:02:05 2018 +0000 maint: Add script for vendoring/updating Rust dependencies. * ADD documentation for usage both inside the script and in doc/HACKING/CodingStandardsRust.md * FIXES part of #25310: https://bugs.torproject.org/25310 --- doc/HACKING/CodingStandardsRust.md | 20 +++++++++++++++ scripts/maint/updateRustDependencies.sh | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/doc/HACKING/CodingStandardsRust.md b/doc/HACKING/CodingStandardsRust.md index 915d37e00..7c6405e62 100644 --- a/doc/HACKING/CodingStandardsRust.md +++ b/doc/HACKING/CodingStandardsRust.md @@ -81,6 +81,26 @@ Currently, Tor requires that you use the latest stable Rust version. At some point in the future, we will freeze on a given stable Rust version, to ensure backward compatibility with stable distributions that ship it. + Updating/Adding Dependencies +------------------------------ + +To add/remove/update dependencies, first add your dependencies, +exactly specifying their versions, into the appropriate *crate-level* +`Cargo.toml` in `src/rust/` (i.e. *not* `/src/rust/Cargo.toml`, but +instead the one for your crate). Also, investigate whether your +dependency has any optional dependencies which are unnecessary but are +enabled by default. If so, you'll likely be able to enable/disable +them via some feature, e.g.: + +```toml +[dependencies] +foo = { version = "1.0.0", default-features = false } +``` + +Next, run `/scripts/maint/updateRustDependencies.sh`. Then, go into +`src/ext/rust` and commit the changes to the `tor-rust-dependencies` +repo. + Documentation --------------- diff --git a/scripts/maint/updateRustDependencies.sh b/scripts/maint/updateRustDependencies.sh new file mode 100755 index 000000000..a5a92579d --- /dev/null +++ b/scripts/maint/updateRustDependencies.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2018 The Tor Project, Inc. +# Copyright (c) 2018 isis agora lovecruft +# See LICENSE for license information +# +# updateRustDependencies.sh +# ------------------------- +# Update our vendored Rust dependencies, either adding/removing +# dependencies and/or upgrading current dependencies to newer +# versions. +# +# To use this script, first add your dependencies, exactly specifying +# their versions, into the appropriate *crate-level* Cargo.toml in +# src/rust/ (i.e. *not* /src/rust/Cargo.toml, but instead the one for +# your crate). +# +# Next, run this script. Then, go into src/ext/rust and commit the +# changes to the tor-rust-dependencies repo. + +set -e + +HERE=`dirname $(realpath $0)` +TOPLEVEL=`dirname $(dirname $HERE)` +TOML="$TOPLEVEL/src/rust/Cargo.toml" +VENDORED="$TOPLEVEL/src/ext/rust/crates" +CARGO=`which cargo` + +if ! test -f "$TOML" ; then + printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\n" "$TOML" +fi + +if ! test -d "$VENDORED" ; then + printf "Error: Couldn't find directory for Rust dependencies! Expected location: %s\n" "$VENDORED" +fi + +if test -z "$CARGO" ; then + printf "Error: cargo must be installed and in your \$PATH\n" +fi + +if test -z `cargo --list | grep vendor` ; then + printf "Error: cargo-vendor not installed\n" +fi + +$CARGO vendor -v --locked --explicit-version --no-delete --sync $TOML $VENDORED

1 0