summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-09-09 11:11:44 +0000
committerTails developers <amnesia@boum.org>2013-09-09 11:11:44 +0000
commit41cd14e9b244bf9a467083ccf482d57719b69eee (patch)
treea1485e912fc4ae2960cd922a1417d27407535f8a
parentbb5cf494a1220cf77fa5376ae5b566111a9740e4 (diff)
parent2beb9c92687c2bd1174ba5c68ee6cf5a3d44f950 (diff)
Merge branch 'feature/tor-0.2.4' into devel0.20.1-rc1
-rw-r--r--config/chroot_local-includes/etc/ssh/ssh_config2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/connect-socks4
-rw-r--r--config/chroot_sources/torproject.chroot1
-rw-r--r--wiki/src/contribute/design.mdwn8
4 files changed, 13 insertions, 2 deletions
diff --git a/config/chroot_local-includes/etc/ssh/ssh_config b/config/chroot_local-includes/etc/ssh/ssh_config
index a981482..9d36784 100644
--- a/config/chroot_local-includes/etc/ssh/ssh_config
+++ b/config/chroot_local-includes/etc/ssh/ssh_config
@@ -3,7 +3,7 @@ ProxyCommand none
Host *
-ProxyCommand connect-proxy -S 127.0.0.1:9050 %h %p
+ProxyCommand /usr/local/bin/connect-socks %h %p
Ciphers aes256-ctr,aes256-cbc,aes128-ctr,aes128-cbc,3des-cbc
MACs hmac-sha1,hmac-md5,hmac-ripemd160
diff --git a/config/chroot_local-includes/usr/local/bin/connect-socks b/config/chroot_local-includes/usr/local/bin/connect-socks
index eb2e227..fc39517 100755
--- a/config/chroot_local-includes/usr/local/bin/connect-socks
+++ b/config/chroot_local-includes/usr/local/bin/connect-socks
@@ -1,2 +1,4 @@
#!/bin/sh
-connect-proxy -s $*
+SOCKS5_USER="${SOCKS5_USER:-}" \
+ SOCKS5_PASSWORD="${SOCKS5_PASSWORD:-}" \
+ connect-proxy -s $*
diff --git a/config/chroot_sources/torproject.chroot b/config/chroot_sources/torproject.chroot
index 2485145..229529c 100644
--- a/config/chroot_sources/torproject.chroot
+++ b/config/chroot_sources/torproject.chroot
@@ -1 +1,2 @@
deb http://deb.torproject.org/torproject.org squeeze main
+deb http://deb.torproject.org/torproject.org tor-0.2.4.x-squeeze main
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 2c4140e..de383d1 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1044,6 +1044,14 @@ soft-blocks all other kinds of wireless devices (e.g. UWB, GPS, FM).
- [[!tails_gitweb config/chroot_local-includes/etc/init.d/tails-set-wireless-devices-state]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/tails-set-wireless-devices-state]]
+### 3.6.20 OpenSSH
+
+The OpenSSH client is configured to use the Tor SOCKS proxy, and to
+prefer strong ciphers and MACs..
+
+- [[!tails_gitweb config/chroot_local-includes/etc/ssh/ssh_config]]
+- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/connect-socks]]
+
## 3.7 Running Tails in virtual machines
### 3.7.1 Current support