Merge branch 'release-0.6.1' into develop

README.rst

@@ -92,8 +92,6 @@ Roadmap Pre-1.0
 ===============
 
 - minor code cleanups
-- minor additions of missing functionality
-- logging improvements, mostly post-sync.  Pre-sync logs seem decent.
 - at most 1 more DB format change; I will make a weak attempt to
   retain 0.6 release's DB format if possible
 - provision of configurable ways to limit client connections so as to

docs/RELEASE-NOTES

@@ -1,3 +1,12 @@
+version 0.6.1
+-------------
+
+- main focus was better logging - more concise and informative, particularly
+  when caught up
+- issues closed: #26, #27
+- default reorg limit is now taken from the coin, with a high default for
+  bitcoin testnet
+
 version 0.6.0
 -------------
 

server/version.py

@@ -1 +1 @@
-VERSION = "ElectrumX 0.6.0"
+VERSION = "ElectrumX 0.6.1"