Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next

diff --combined make.sh
index 786d91778544dd509b7aa1dc1c0d37f8e7866b36,f74288d5319af7995cbbb08ef9b95a0873115509..7fcb69f9357030b3d438f6ea290742ca4ab9a9a2
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -333,7 -333,6 +333,7 @@@ buildbase() 
      lfsmake2 gettext
      lfsmake2 grep
      lfsmake2 groff
 +    lfsmake2 gperf
      lfsmake2 gzip
      lfsmake2 inetutils
      lfsmake2 iproute2
@@@ -780,6 -779,8 +780,8 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
+   ipfiremake tor
+   ipfiremake arm
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild