summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-05-18 15:40:28 +0200
committerTails developers <amnesia@boum.org>2013-05-18 15:40:28 +0200
commitd4b26834159195a8b7a64bbcf7faf04eba8519c7 (patch)
tree01983aa6f2ca81af49ce5f77dbebec7dd4239d73 /debian
parent008450c5b3369012c81461bf1fc68eec9fa8d3f5 (diff)
parent68ca8d74de44f951f2a6158dbdd1cfe865b91a18 (diff)
Merge remote-tracking branch 'origin/master' into devel
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 78cbce1..47c34a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,7 @@ tails (0.18) unstable; urgency=low
which in turn makes Torbutton think it should start in non-Tor mode.
· Also pass the TOR_SOCKS_* environment variables to iceweasel when
generating the profile: Torbutton behaves differently depending on
- these variables, so we don't want the initial profile generation do be
+ these variables, so we don't want the initial profile generation to be
done without them. In practice, this has no implication that we could
see right now, but better safe than sorry.
· Import all version overrides from the TBB prefs.
@@ -74,6 +74,7 @@ tails (0.18) unstable; urgency=low
from experimental.
* Bugfixes
+ - Linux 3.2.41-2+deb7u2.
- Fixed swapped filenames of tails-{reboot,shutdown}.desktop.
Thanks to Mikko Harhanen for the patch.
- Only add ClientTransportPlugin to torrc when bridge mode is enabled.