Merge branch 'dev' into edge

make-linux.mk

@@ -240,6 +240,7 @@ ifeq ($(ZT_ARCHITECTURE),3)
 	else
 		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm
 		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm
+		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
 	endif
 endif