propellor spin
Apt: stable-updates suite

Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
Tor: hiddenServiceData

Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
Merge branch 'joeyconfig'

Conflicts:
	privdata/privdata.gpg
Merge remote-tracking branch 'origin/master'