Merge branch 'arm_support' into v3.0.x

Author: reddink

src/Makefile.am

@@ -58,7 +58,7 @@ BITCOIN_CORE_H = \
   rpcprotocol.h \
   rpcserver.h \
   script.h \
-  crytpo/scrypt.h \
+  crypto/scrypt.h \
   serialize.h \
   sync.h \
   threadsafety.h \