tor-commits February 2015

tor-commits@lists.torproject.org

15 participants
2121 discussions

[tor/master] Merge remote-tracking branch 'public/feature_13555'
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 0c81dfa848da160b02818771626a425cd27b86bc Merge: 37c9c26 daab405 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 08:42:00 2015 -0500 Merge remote-tracking branch 'public/feature_13555' changes/feature_13555 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Bump the minimum relay version to 0.2.4.18-rc
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit daab4051684c89635cbea697337820c2e58b2387 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 4 13:27:56 2015 -0500 Bump the minimum relay version to 0.2.4.18-rc Closes #13555 --- changes/feature_13555 | 3 +++ src/or/dirserv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/feature_13555 b/changes/feature_13555 new file mode 100644 index 0000000..bc9ca37 --- /dev/null +++ b/changes/feature_13555 @@ -0,0 +1,3 @@ + o Deprecated versions: + - Tor relays older than 0.2.4.18-rc are no longer allowed to advertise + themselves on the network. Closes ticket 13555. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d906195..1504b3b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -285,9 +285,9 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, strmap_size(fingerprint_list->fp_by_name), digestmap_size(fingerprint_list->status_by_digest)); - /* Versions before Tor 0.2.3.16-alpha are too old to support, and are + /* Versions before Tor 0.2.4.18-rc are too old to support, and are * missing some important security fixes too. Disable them. */ - if (platform && !tor_version_as_new_as(platform,"0.2.3.16-alpha")) { + if (platform && !tor_version_as_new_as(platform,"0.2.4.18-rc")) { if (msg) *msg = "Tor version is insecure or unsupported. Please upgrade!"; return FP_REJECT;

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug14819'
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 37c9c268c8f5b76c955fe7b450b48623cf744dd3 Merge: 5c820de 353d2fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 11 08:40:48 2015 -0500 Merge remote-tracking branch 'sebastian/bug14819' changes/bug14819 | 5 +++++ configure.ac | 21 ++------------------- 2 files changed, 7 insertions(+), 19 deletions(-)

1 0

[tor/master] Re-remove the --disable-threads configure option
by nickm＠torproject.org 11 Feb '15

11 Feb '15

commit 353d2fe7e144dee5fbc9b4d6e47ada4edeba59cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 09:09:00 2015 +0100 Re-remove the --disable-threads configure option --- changes/bug14819 | 5 +++++ configure.ac | 21 ++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/changes/bug14819 b/changes/bug14819 new file mode 100644 index 0000000..7b47771 --- /dev/null +++ b/changes/bug14819 @@ -0,0 +1,5 @@ + o Minor bugfixes + - Remove the --disable-threads configure option again. It was accidentally + partially re-introduced in 29ac883606d6d5ebfdcc2efceb2b4b60ee6a8916. + Fixes bug 13819; bugfix on 0.2.6.2-alpha. + diff --git a/configure.ac b/configure.ac index af16edf..8daddf0 100644 --- a/configure.ac +++ b/configure.ac @@ -156,22 +156,6 @@ if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found]) fi -AC_ARG_ENABLE(threads, - AS_HELP_STRING(--disable-threads, disable multi-threading support)) - -if test x$enable_threads = x; then - case $host in - *-*-solaris* ) - # Don't try multithreading on solaris -- cpuworkers seem to lock. - AC_MSG_NOTICE([You are running Solaris; Sometimes threading makes -cpu workers lock up here, so I will disable threads.]) - enable_threads="no";; - *) - enable_threads="yes";; - esac -fi - - case $host in *-*-solaris* ) AC_DEFINE(_REENTRANT, 1, [Define on some platforms to activate x_r() functions in time.h]) @@ -400,9 +384,8 @@ fi AC_SEARCH_LIBS(pthread_create, [pthread]) AC_SEARCH_LIBS(pthread_detach, [pthread]) -AM_CONDITIONAL(THREADS_WIN32, test "$enable_threads" = "yes" && test "$bwin32" = "true") -AM_CONDITIONAL(THREADS_PTHREADS, test "$enable_threads" = "yes" && test "$bwin32" = "false") -AM_CONDITIONAL(THREADS_NONE, test "$enable_threads" != "yes") +AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") +AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") dnl ------------------------------------------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 11 Feb '15

11 Feb '15

commit 7370f914f30818ad70e7552945eb5639d1047ff2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 11 13:16:03 2015 +0000 Update translations for tails-iuk_completed --- hr_HR.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 3b38c36..64b0480 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# skiddiep <lyricaltumor(a)gmail.com>, 2015 # Tea Horvatic <teahorvatic(a)yahoo.co.uk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-09-18 21:27-0700\n" -"PO-Revision-Date: 2014-09-19 09:58+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-01-13 14:19+0100\n" +"PO-Revision-Date: 2015-02-11 13:15+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "Za informacije o uklanjanju greški, pogledajte /home/amnesia/.xsession- #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" -msgstr "Greška u provjeri nadogradnji" +msgstr "Greška pri provjeri nadogradnji" #: ../lib/Tails/IUK/Frontend.pm:219 msgid "" @@ -34,7 +35,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "<b>Neuspjelo utvrđivanje ima li dostupnih nadogradnji s naše stranice.</b>\n\nProvjerite svoju vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\n\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "<b>Neuspjelo utvrđivanje ima li dostupnih nadogradnji s naše stranice.</b>\n\nProvjerite svoju mrežnu vezu i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\n\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:234 msgid "no automatic upgrade is available from our website for this version" @@ -67,21 +68,21 @@ msgstr "Sustav je ažuriran" #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." -msgstr "Ovo je starija verzija Tails i može imati sigurnosnih problema." +msgstr "Ovo je starija verzija Tails-a i može imati sigurnosnih problema." #: ../lib/Tails/IUK/Frontend.pm:318 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "Dostupna dodatna nadogradnja zahtjeva %{space_needed}a slobodnog prostora na particiji Tails sustava, a slobodno je samo %{free_space}a." +msgstr "Dostupna dodatna nadogradnja zahtjeva %{space_needed}s slobodnog prostora na particiji Tails sustava, a slobodno je samo %{free_space}s." #: ../lib/Tails/IUK/Frontend.pm:334 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "Dostupna dodatna nadogradnja zahtjeva %{memory_needed} slobodne memorije, a slobodno je samo %{free_memory}." +msgstr "Dostupna dodatna nadogradnja zahtjeva %{memory_needed}s slobodne memorije, a slobodno je samo %{free_memory}s." #: ../lib/Tails/IUK/Frontend.pm:356 msgid "" @@ -107,15 +108,15 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "<b>Trebali biste nadograditi %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nPreporučamo da zatvorite sve otvorene aplikacije tijekom nadogradnje.\nPreuzimanje nadogradnje bi moglo potrajati dulje vremena, od nekoliko minuta do nekoliko sati.\nNakon preuzimanja nadogradnje, mreža će biti onemogućena.\n\nVeličina preuzimanja: %{size}s\n\nŽelite li nadogradnju sada?" +msgstr "<b>Trebali biste nadograditi na %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nPreporučamo da zatvorite sve otvorene aplikacije tijekom nadogradnje.\nPreuzimanje nadogradnje bi moglo potrajati dulje vremena, od nekoliko minuta do nekoliko sati.\nNakon preuzimanja nadogradnje, mreža će biti onemogućena.\n\nVeličina preuzimanja: %{size}s\n\nŽelite li nadogradnju sada?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "Dostupna nadogradnja" +msgstr "Nadogradnja dostupna" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" -msgstr "Nadogradi sada" +msgstr "Nadogradi sad" #: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade later" @@ -131,7 +132,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "<b>Trebate ručno nadograditi %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nNije moguće automatski nadograditi Vaš uređaj na novu verziju: %{explanation}s.\n\nDa biste saznali kako napraviti ručnu nadogradnju, idite na https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "<b>Trebate ručno nadograditi na %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nNije moguće automatski nadograditi Vaš uređaj na novu verziju: %{explanation}s.\n\nDa biste saznali kako napraviti ručnu nadogradnju, idite na https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" @@ -152,7 +153,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "<b>Nadogradnja se nije mogla preuzeti.</b>\\n\\nProvjerite svoju vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\\n\\nako se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "<b>Nadogradnja se nije mogla preuzeti.</b>\\n\\nProvjerite vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\\n\\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 11 Feb '15

11 Feb '15

commit fc446af663bdd51d300c62cca71f3527ea8e9220 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 11 13:15:57 2015 +0000 Update translations for tails-iuk --- hr_HR.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 3b38c36..64b0480 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# skiddiep <lyricaltumor(a)gmail.com>, 2015 # Tea Horvatic <teahorvatic(a)yahoo.co.uk>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-09-18 21:27-0700\n" -"PO-Revision-Date: 2014-09-19 09:58+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-01-13 14:19+0100\n" +"PO-Revision-Date: 2015-02-11 13:15+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "Za informacije o uklanjanju greški, pogledajte /home/amnesia/.xsession- #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" -msgstr "Greška u provjeri nadogradnji" +msgstr "Greška pri provjeri nadogradnji" #: ../lib/Tails/IUK/Frontend.pm:219 msgid "" @@ -34,7 +35,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "<b>Neuspjelo utvrđivanje ima li dostupnih nadogradnji s naše stranice.</b>\n\nProvjerite svoju vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\n\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "<b>Neuspjelo utvrđivanje ima li dostupnih nadogradnji s naše stranice.</b>\n\nProvjerite svoju mrežnu vezu i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\n\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:234 msgid "no automatic upgrade is available from our website for this version" @@ -67,21 +68,21 @@ msgstr "Sustav je ažuriran" #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." -msgstr "Ovo je starija verzija Tails i može imati sigurnosnih problema." +msgstr "Ovo je starija verzija Tails-a i može imati sigurnosnih problema." #: ../lib/Tails/IUK/Frontend.pm:318 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "Dostupna dodatna nadogradnja zahtjeva %{space_needed}a slobodnog prostora na particiji Tails sustava, a slobodno je samo %{free_space}a." +msgstr "Dostupna dodatna nadogradnja zahtjeva %{space_needed}s slobodnog prostora na particiji Tails sustava, a slobodno je samo %{free_space}s." #: ../lib/Tails/IUK/Frontend.pm:334 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "Dostupna dodatna nadogradnja zahtjeva %{memory_needed} slobodne memorije, a slobodno je samo %{free_memory}." +msgstr "Dostupna dodatna nadogradnja zahtjeva %{memory_needed}s slobodne memorije, a slobodno je samo %{free_memory}s." #: ../lib/Tails/IUK/Frontend.pm:356 msgid "" @@ -107,15 +108,15 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "<b>Trebali biste nadograditi %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nPreporučamo da zatvorite sve otvorene aplikacije tijekom nadogradnje.\nPreuzimanje nadogradnje bi moglo potrajati dulje vremena, od nekoliko minuta do nekoliko sati.\nNakon preuzimanja nadogradnje, mreža će biti onemogućena.\n\nVeličina preuzimanja: %{size}s\n\nŽelite li nadogradnju sada?" +msgstr "<b>Trebali biste nadograditi na %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nPreporučamo da zatvorite sve otvorene aplikacije tijekom nadogradnje.\nPreuzimanje nadogradnje bi moglo potrajati dulje vremena, od nekoliko minuta do nekoliko sati.\nNakon preuzimanja nadogradnje, mreža će biti onemogućena.\n\nVeličina preuzimanja: %{size}s\n\nŽelite li nadogradnju sada?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "Dostupna nadogradnja" +msgstr "Nadogradnja dostupna" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" -msgstr "Nadogradi sada" +msgstr "Nadogradi sad" #: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade later" @@ -131,7 +132,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "<b>Trebate ručno nadograditi %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nNije moguće automatski nadograditi Vaš uređaj na novu verziju: %{explanation}s.\n\nDa biste saznali kako napraviti ručnu nadogradnju, idite na https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "<b>Trebate ručno nadograditi na %{name}s %{version}s.</b>\n\nZa više informacija o novoj verziji, idite na %{details_url}s\n\nNije moguće automatski nadograditi Vaš uređaj na novu verziju: %{explanation}s.\n\nDa biste saznali kako napraviti ručnu nadogradnju, idite na https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" @@ -152,7 +153,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "<b>Nadogradnja se nije mogla preuzeti.</b>\\n\\nProvjerite svoju vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\\n\\nako se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "<b>Nadogradnja se nije mogla preuzeti.</b>\\n\\nProvjerite vezu s mrežom i ponovno pokrenite Tails kako biste ponovno pokušali nadogradnju.\\n\\nAko se problem i dalje pojavljuje, idite na file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade"

1 0

[webwml/master] Replace non-breaking space with normal space
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit bb10520f7d54da9a0f824bd0346848e88e9d4b62 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:38:19 2015 +0100 Replace non-breaking space with normal space --- projects/en/torbrowser.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 99e80ed..4f97dce 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -37,7 +37,7 @@ <span class="normal">Tor Browser</span> </a> <p>Installation Instructions - <br><a href="#windows">Windows</a> • <a href="#macosx">OS X</a> • <a href="#linux">Linux</a></p> + <br><a href="#windows">Windows</a> • <a href="#macosx">Mac OS X</a> • <a href="#linux">Linux</a></p> </div> <!-- Commenting out the videos until support updates them to use TB 4.0 <div class="pjvids"> @@ -51,7 +51,7 @@ <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> Windows</a></td> <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> - Apple OS X</a></td> + Mac OS X</a></td> <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> Linux</a></td> </tr> @@ -82,7 +82,7 @@ <tr> <th><br>Language</th> <th>Microsoft Windows<br><em>(<version-torbrowserbundle>)</em></th> - <th>Mac OS X<br><em>(<version-torbrowserbundleosx32>)</em></th> + <th>Mac OS X<br><em>(<version-torbrowserbundleosx32>)</em></th> <th>Linux<br><em>(<version-torbrowserbundlelinux32>)</em></th> </tr> </thead> @@ -304,7 +304,7 @@ <tr> <th><br>Language</th> <th>Microsoft Windows<br><em>(<version-torbrowserbundlebeta>)</em></th> - <th>Mac OS X<br><em>(<version-torbrowserbundleosx64beta>)</em></th> + <th>Mac OS X<br><em>(<version-torbrowserbundleosx64beta>)</em></th> <th>Linux<br><em>(<version-torbrowserbundlelinux32beta>)</em></th> </tr> </thead> @@ -513,7 +513,7 @@ <div id="macosx" class="anchor"></div> <div class="macosx box"> - <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> + <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> <p>Download the file above, save it somewhere, then click on it. This opens the .dmg file. (On recent versions of OS X, you might get

1 0

[webwml/master] People like spelling it OS X
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit ecaa2485a9bcf32e1a0bb56905b58a01432789fa Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:41:26 2015 +0100 People like spelling it OS X --- docs/en/faq.wml | 4 ++-- docs/torbutton/en/design/design.xml | 4 ++-- docs/torbutton/en/design/index.html.en | 4 ++-- download/en/download.wml | 4 ++-- projects/en/gettor.wml | 2 +- projects/torbrowser/design/index.html.en | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index be15a45..c946740 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -1050,7 +1050,7 @@ and send an email to '<tt>gettor(a)torproject.org</tt>' with one of the following words in the body of the message: <tt>windows</tt>, <tt>osx</tt> or <tt>linux</tt> (case insensitive). You will receive a reply with links from popular cloud services to -download Tor Browser for Windows, Mac OSX or Linux, depending on the +download Tor Browser for Windows, Mac OS X or Linux, depending on the option you chose. Currently, the only cloud service supported is Dropbox. If you send a blank message or anything different from the options mentioned, you will receive a help message with detailed @@ -2443,7 +2443,7 @@ too. may be torrc.client and torrc.relay.</li> <li>Modify the Tor client and relay startup scripts to include '-f /path/to/correct/torrc'.</li> - <li>In Linux/BSD/OSX, changing the startup scripts to Tor.client + <li>In Linux/BSD/Mac OS X, changing the startup scripts to Tor.client and Tor.relay may make separation of configs easier.</li> </ul> diff --git a/docs/torbutton/en/design/design.xml b/docs/torbutton/en/design/design.xml index 588d6f4..d50f267 100644 --- a/docs/torbutton/en/design/design.xml +++ b/docs/torbutton/en/design/design.xml @@ -244,8 +244,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 2<superscript>3</superscript>=8). Interface effects such as title bar font size diff --git a/docs/torbutton/en/design/index.html.en b/docs/torbutton/en/design/index.html.en index 4a6efd0..82ecd64 100644 --- a/docs/torbutton/en/design/index.html.en +++ b/docs/torbutton/en/design/index.html.en @@ -148,8 +148,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 2<sup>3</sup>=8). Interface effects such as title bar font size diff --git a/download/en/download.wml b/download/en/download.wml index f9490e2..d5b7f7a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -90,7 +90,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> -# Comment out until 64-bit OSX bundles are available again +# Comment out until 64-bit Mac OS X bundles are available again # <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> # <select name="language" id="osx-tbb64" class="lang"> @@ -98,7 +98,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo # </select> # <div class="sig"> # <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> -#<!-- OSX 64. -EC +#<!-- Mac OS X 64. -EC # (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> # </div> # <a href="<page projects/torbrowser-details>#build">Source Code</a><br /> diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml index 67fd9fb..4a5d6fd 100644 --- a/projects/en/gettor.wml +++ b/projects/en/gettor.wml @@ -32,7 +32,7 @@ one of the following options in the body of the message:</p> </li> <li><strong>linux</strong>: If the user needs Tor Browser for Linux. </li> - <li><strong>osx</strong>: If the user needs Tor Browser for Mac OSX. + <li><strong>osx</strong>: If the user needs Tor Browser for Mac OS X. </li> </ul> diff --git a/projects/torbrowser/design/index.html.en b/projects/torbrowser/design/index.html.en index 1bd9530..e063944 100644 --- a/projects/torbrowser/design/index.html.en +++ b/projects/torbrowser/design/index.html.en @@ -1206,7 +1206,7 @@ details such as screen orientation or type. We patch Firefox to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/30dc2c4290698af81c…" target="_top">report a fixed set of system colors to content window CSS</a>, and <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/8f6e979d30598569de…" target="_top">prevent -detection of font smoothing on OSX</a>. We also always +detection of font smoothing on Mac OS X</a>. We also always <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/09561f0e5452305b9e…" target="_top">report landscape-primary</a> for the screen orientation. @@ -1831,4 +1831,4 @@ not directly provide the link sharing capabilities that Web-Send does, it is a better solution to the privacy issues associated with federated login than Web-Send is. - </p></li></ol></div></div></div></div></body></html> \ No newline at end of file + </p></li></ol></div></div></div></div></body></html>

1 0

[webwml/master] Link to tbb blog posts from download-easy
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 706bc301671ea8288d205ee50b928d0d451ac982 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:31:43 2015 +0100 Link to tbb blog posts from download-easy --- download/en/download-easy.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index a528e66..727a874 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -60,7 +60,7 @@ <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> <h2>Tor Browser for Mac</h2> - <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> + <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> @@ -81,7 +81,7 @@ <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> <h2>Tor Browser for GNU/Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> + <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> <a href="<page projects/torbrowser>">Learn more »</a></p> </div> @@ -103,7 +103,7 @@ <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> <h2>Tor Browser for 64-Bit GNU/Linux</h2> - <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> + <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads">

1 0

[webwml/master] spaces
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit c81e08d9823cd38435b0d524919abef9b5b29338 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:21:24 2015 +0100 spaces --- docs/en/tor-doc-windows.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml index dbeae88..0cef883 100644 --- a/docs/en/tor-doc-windows.wml +++ b/docs/en/tor-doc-windows.wml @@ -11,8 +11,8 @@ <a href="<page index>">Home » </a> <a href="<page docs/documentation>">Documentation » </a> <a href="<page docs/tor-doc-windows>">Windows Client</a> - </div> - <div id="maincol"> + </div> + <div id="maincol"> <h1>Running the <a href="<page index>">Tor</a> client on Microsoft Windows</h1> <br> @@ -21,28 +21,28 @@ href="<page projects/torbrowser>">Tor Browser</a> and you are done. </h2> - + <p>If it's still not working, look at <a href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p> - + <p> Once it's working, learn more about <a href="<page download/download>#Warning">what Tor does and does not offer</a>. </p> - + <hr> <a id="server"></a> <a id="relay"></a> <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2> <br> - + <p>The Tor network relies on volunteers to donate bandwidth. If you want to help <strong>make the Tor network faster</strong>, please consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p> - + <hr> - + <p>If you have suggestions for improving this document, please <a href="<page about/contact>">send them to us</a>. Thanks!</p> </div> @@ -54,4 +54,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2015