Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/doc/release-notes/release-notes-1.0.10-1.md
+++ b/doc/release-notes/release-notes-1.0.10-1.md
@@ -0,0 +1,11 @@
+Jack Grigg (1):
+      Disable building Proton in Gitian
+
+Sean Bowe (2):
+      Revert "Remove an unneeded version workaround as per @str4d's review comment."
+      Revert "Delete old protocol version constants and simplify code that used them."
+
+Simon Liu (2):
+      make-release.py: Versioning changes for 1.0.10-1.
+      make-release.py: Updated manpages for 1.0.10-1.
+