Commit d4e29b11 authored by T(A)ILS developers's avatar T(A)ILS developers
Browse files

Merge branch 'stable' into release

Conflicts:
	config/chroot_local-includes/usr/share/locale/ar/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/de/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/en/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/es/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/fr/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/it/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/pt/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/locale/zh/LC_MESSAGES/tails-htp-notify-user.po
	config/chroot_local-includes/usr/share/nautilus-sfill/messages.pot
	config/chroot_local-includes/usr/share/nautilus-wipe/messages.pot
	config/chroot_local-includes/usr/share/tails-htp-notify-user/messages.pot
	config/chroot_local-includes/usr/share/tails-security-check/messages.pot
	config/chroot_local-includes/usr/share/tails-virt-notify-user/messages.pot
parents 0164a2ed 9efc3419
......@@ -54,7 +54,7 @@ declare -a HTP_POOL
HTP_POOL=(
'www.torproject.org'
'mail.riseup.net'
'www.google.com'
'encrypted.google.com'
'ssl.scroogle.org'
)
......
browser.search.defaultenginename=Scroogle SSL Arabic
browser.search.selectedEngine=Scroogle SSL Arabic
browser.startup.homepage=https://check.torproject.org/
browser.startup.homepage=https://check.torproject.org/?small=1
browser.search.defaultenginename=Scroogle SSL Deutsch
browser.search.selectedEngine=Scroogle SSL Deutsch
browser.startup.homepage=https://check.torproject.org/?lang=de
browser.startup.homepage=https://check.torproject.org/?lang=de&small=1
browser.search.defaultenginename=Scroogle SSL English
browser.search.selectedEngine=Scroogle SSL English
browser.startup.homepage=https://check.torproject.org/
browser.startup.homepage=https://check.torproject.org/?small=1
browser.search.defaultenginename=Scroogle SSL Español
browser.search.selectedEngine=Scroogle SSL Español
browser.startup.homepage=https://check.torproject.org/?lang=es
browser.startup.homepage=https://check.torproject.org/?lang=es&small=1
browser.search.defaultenginename=Scroogle SSL en français
browser.search.selectedEngine=Scroogle SSL en français
browser.startup.homepage=https://check.torproject.org/?lang=fr
\ No newline at end of file
browser.startup.homepage=https://check.torproject.org/?lang=fr&small=1
\ No newline at end of file
browser.search.defaultenginename=Scroogle SSL Italiano
browser.search.selectedEngine=Scroogle SSL Italiano
browser.startup.homepage=https://check.torproject.org/?lang=it_IT
browser.startup.homepage=https://check.torproject.org/?lang=it_IT&small=1
browser.search.defaultenginename=Scroogle SSL Portuguese
browser.search.selectedEngine=Scroogle SSL Portuguese
browser.startup.homepage=https://check.torproject.org/?lang=pt_BR
browser.startup.homepage=https://check.torproject.org/?lang=pt_BR&small=1
browser.search.defaultenginename=Scroogle SSL Chinese
browser.search.selectedEngine=Scroogle SSL Chinese
browser.startup.homepage=https://check.torproject.org/?lang=zh_CN
browser.startup.homepage=https://check.torproject.org/?lang=zh_CN&small=1
......@@ -6,7 +6,7 @@ user_pref("extensions.firegpg.enable_gpgapi", false);
user_pref("extensions.firegpg.gmail_enabled", false);
user_pref("extensions.firegpg.gmail_enabled", false);
user_pref("extensions.firegpg.gpg_version", "FIREGPG_VERSION");
user_pref("extensions.firegpg.keyserver", "pool.sks-keyservers.net");
user_pref("extensions.firegpg.keyserver", "keys.indymedia.org");
user_pref("extensions.firegpg.show_website", false);
user_pref("extensions.torbutton.block_tforms", false);
user_pref("extensions.torbutton.clear_cookies", true);
......
<gconfentryfile>
<entrylist base="/desktop/pgp">
<entry>
<key>keyservers/all_keyservers</key>
<value>
<list type="string">
<value>
<string>hkps://keys.indymedia.org</string>
</value>
</list>
</value>
</entry>
</entrylist>
</gconfentryfile>
\ No newline at end of file
tails (0.6.1) unstable; urgency=low
* Tor: upgrade to 0.1.28 (fixes CVE-2010-1676)
* Software: upgrade NSS, Xulrunner, glibc (fixes various security issues)
* FireGPG: use the same keyserver as the one configured in gpg.conf.
* Seahorse: use same keyserver as in gpg.conf.
* HTP: display the logs when the clock synchronization fails.
* Update HTP configuration: www.google.com now redirects to
encrypted.google.com.
* Use the light version of the "Are you using Tor?" webpage.
* Update AdBlock patterns.
-- T(A)ILS developers <amnesia@boum.org> Fri, 24 Dec 2010 13:28:29 +0100
tails (0.6) unstable; urgency=low
* Releasing 0.6.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment