From c881397f8eb1d31dd28d7494cc0e50226ef494a3 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 13 Apr 2019 20:06:37 +0100
Subject: [PATCH] Prepare 1.10.1

---
 docs/changelog.rst    | 18 ++++++++++++++++++
 docs/conf.py          |  2 +-
 electrumx/__init__.py |  2 +-
 setup.py              |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e03163e..28f74f9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,24 @@
    should not occur with Python 3.7.
 
 
+Version 1.10.1 (13 Apr 2019)
+============================
+
+* introduce per-request costing.  See environment variables documentation for new
+  variables :envvar:`COST_SOFT_LIMIT`, :envvar:`COST_HARD_LIMIT`, :envvar:`REQUEST_SLEEP`,
+  :envvar:`INITIAL_CONCURRENT`, :envvar:`BANDWIDTH_UNIT_COST`.  Sessions are placed in groups
+  with which they share some of their costs.  Prior cost is remembered across reconnects.
+* require aiorpcX 0.13.5 for better concurrency handling
+* require clients use protocol 1.4 or higher
+* handle transaction.get_merkle requests more efficiently (ghost43)
+* Windows support (sancoder)
+* peers improvements (ghost43)
+* report mempool and block sizes in logs
+* electrumx_rpc: timeout raised to 30s, fix session request counts
+* other tweaks and improvements by Bjorge Dijkstra, ghost43, peleion,
+* coin additions / updates: ECA (Jenova7), ECCoin (smogm), GXX (DEVCØN), BZX (2INFINITY),
+  DeepOnion (Liam Alford), CivX / EXOS (turcol)
+
 Version 1.10.0 (15 Mar 2019)
 ============================
 
diff --git a/docs/conf.py b/docs/conf.py
index cb93a48..9098110 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,7 +15,7 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
-VERSION="ElectrumX 1.9.5"
+VERSION="ElectrumX 1.10.1"
 
 # -- Project information -----------------------------------------------------
 
diff --git a/electrumx/__init__.py b/electrumx/__init__.py
index f851b33..ee8a992 100644
--- a/electrumx/__init__.py
+++ b/electrumx/__init__.py
@@ -1,4 +1,4 @@
-version = 'ElectrumX 1.10.0'
+version = 'ElectrumX 1.10.1'
 version_short = version.split()[-1]
 
 from electrumx.server.controller import Controller
diff --git a/setup.py b/setup.py
index d7ac00e..9c1b17c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 import setuptools
-version = '1.10.0'
+version = '1.10.1'
 
 setuptools.setup(
     name='electrumX',