Merge branch 'master' into dev

llarp/win32/abyss.rc

@@ -81,18 +81,18 @@ BEGIN
             VALUE "CompanyName", "Loki Foundation"
             VALUE "FileDescription", "LokiNET for Microsoft® Windows® NT™"
 #ifdef LLARP_RELEASE_MOTTO
-            VALUE "FileVersion", VERSION_STRING(0.5.0, RELEASE_MOTTO, GIT_REV)
+            VALUE "FileVersion", VERSION_STRING(0.5.1, RELEASE_MOTTO, GIT_REV)
 #else
-            VALUE "FileVersion", VERSION_STRING(0.5.0-dev-, GIT_REV)
+            VALUE "FileVersion", VERSION_STRING(0.5.1-dev-, GIT_REV)
 #endif
             VALUE "InternalName", "llarpd"
             VALUE "LegalCopyright", "Copyright ©2018-2019 Jeff Becker, Rick V for the Loki Foundation. All rights reserved. This software is provided under the terms of the zlib-libpng licence; see the file LICENSE for details."
             VALUE "OriginalFilename", "abyss-main.exe"
             VALUE "ProductName", "LokiNET for Windows"
 #ifdef LLARP_RELEASE_MOTTO
-            VALUE "ProductVersion", VERSION_STRING(0.5.0, RELEASE_MOTTO, GIT_REV)
+            VALUE "ProductVersion", VERSION_STRING(0.5.1, RELEASE_MOTTO, GIT_REV)
 #else
-            VALUE "ProductVersion", VERSION_STRING(0.5.0-dev-, GIT_REV)
+            VALUE "ProductVersion", VERSION_STRING(0.5.1-dev-, GIT_REV)
 #endif
         END
     END

osx-setup/make-release.sh

@@ -3,7 +3,10 @@ VERSION=$1
 
 echo "Copying latest build"
 mkdir -p osx-pkg/usr/local/bin
+mkdir osx-pkg/usr/local/lib
 cp ../lokinet osx-pkg/usr/local/bin
+echo "Copying /usr/local/lib/libuv.dylib into package"
+cp /usr/local/lib/libuv.dylib osx-pkg/usr/local/lib
 # just incase they want to switch networks later
 cp ../lokinet-bootstrap osx-pkg/usr/local/bin