summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-27 10:33:10 +0000
committerintrigeri <intrigeri@boum.org>2016-05-27 10:33:10 +0000
commitfd9d549bf27e0a460a31427d13d3360fab3db83b (patch)
treed803421453ba39b30efce16c27f1343ed7a71f9b
parenta8f28255f52185463e7efcc76404152844fff382 (diff)
parent880780ddff528734381836a4d59b69f4b3524333 (diff)
Merge branch 'testing' into devel
-rw-r--r--config/chroot_local-includes/etc/ssh/ssh_config3
-rw-r--r--wiki/src/contribute/design.mdwn3
-rw-r--r--wiki/src/contribute/release_process.mdwn5
3 files changed, 6 insertions, 5 deletions
diff --git a/config/chroot_local-includes/etc/ssh/ssh_config b/config/chroot_local-includes/etc/ssh/ssh_config
index a999ec8..e71fa6a 100644
--- a/config/chroot_local-includes/etc/ssh/ssh_config
+++ b/config/chroot_local-includes/etc/ssh/ssh_config
@@ -5,9 +5,6 @@ Host *
ProxyCommand /usr/local/lib/connect-socks %h %p
-Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
-MACs hmac-sha1,hmac-md5,hmac-ripemd160
-
Compression yes
CompressionLevel 9
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index d7631ae..cbfb137 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1143,8 +1143,7 @@ soft-blocks all other kinds of wireless devices (e.g. UWB, GPS, FM).
### 3.6.20 OpenSSH
-The OpenSSH client is configured to use the Tor SOCKS proxy, and to
-prefer strong ciphers and MACs..
+The OpenSSH client is configured to use the Tor SOCKS proxy.
- [[!tails_gitweb config/chroot_local-includes/etc/ssh/ssh_config]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/lib/connect-socks]]
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 4f803dc..2c52384 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -885,6 +885,11 @@ Write the announcement for the release in
[[!tails_gitweb_commit 9925321]] breaks all existing persistent
profiles).
- Document known issues.
+- This snippet can help to convert the copied changelog's ticket
+ references to links:
+
+ sed -i 's@#\([0-9]\{4,5\}\)@[[!tails_ticket \1]]@g' \
+ wiki/src/news/test_${TAG}.mdwn
In any case
-----------