Auto merge of #1268 - ThisIsNotOfficialCodeItsJustForks:t1130-upgrade-libsodium, r=ebfull

Upgrade libsodium for AVX2-detection bugfix.

Upgrades libsodium to bring in an AVX2-detection bugfix (to help with #1130).

src/test/test_bitcoin.cpp

@@ -6,7 +6,7 @@
 
 #include "test_bitcoin.h"
 
-#include "sodium.h"
+#include "crypto/common.h"
 
 #include "key.h"
 #include "main.h"
@@ -32,7 +32,7 @@ extern void noui_connect();
 
 BasicTestingSetup::BasicTestingSetup()
 {
-        assert(sodium_init() != -1);
+        assert(init_and_check_sodium() != -1);
         ECC_Start();
         SetupEnvironment();
         fPrintToDebugLog = false; // don't want to write to debug.log file