Merge remote-tracking branch 'ummeegge/iptraf-ng' into next

Conflicts:
	make.sh

diff --cc make.sh
index 538151ccd1b608f19ceed9414bb8d3c661378643,4424e762f96d7afebbbab1abdf1962436ffbcd2e..50a58782d1b4a9430075b2d4a181dc315470d595
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -780,9 -779,7 +780,10 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
 +  ipfiremake tor
 +  ipfiremake arm
 +  ipfiremake wavemon
+   ipfiremake iptraf-ng
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild