Merge branch 'master' into android

diff --cc ImmaeEu-down
index db41301aee59670f6be9a8f1e300b167e34ab47d,d5e9ccf83b99386a645826082cecbf54794b1473..657b83f02d88a8b26e38983ec34be804172394e7
mode 100644,100755..100644
--- 1/ImmaeEu-down
--- 2/ImmaeEu-down
+++ b/ImmaeEu-down
@@@ -1,12 -1,11 +1,12 @@@
- #!/bin/sh
 -#!/bin/sh
++#!/system/xbin/sh
  # This file closes down the tap device.
  
 -. /tmp/tinc_$NETNAME
 -rm -f /tmp/tinc_$NETNAME
 +source /sdcard/.tinc/vars
 +rm /sdcard/.tinc/vars
 +
  ip -6 route del default via $GWIP
  for MYIP in $MYIPS; do
 -      ip -6 addr del $MYIP/96 dev $INTERFACE
 +      ip -6 addr del $MYIP/96 dev vpn6
  done
 -ip -6 link set $INTERFACE down
 +ip -6 link set vpn6 down