update readme and version

diff --git a/README.rst b/README.rst
index c59e8f2f04606d3e89e0b4c0b01ea96d79e1fbf3..86808e735751660467c97ee2c8f0f39cfa1c8e97 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -162,6 +162,7 @@ or setting the appropriate environment variable::
 
 Changelog
 =========
+- **1.12.0** Handle maximum word length < minimum case by setting max = min
 - **1.11.1** Fix bug in entropy calc
 - **1.11.0** Rewrite verbose report to take acrostics etc into account
 - **1.10.0** Switch to EFF wordlist as default (note: decrease in entropy of default length passwords to 77 bits, still at EFF recommendations)
@@ -173,7 +174,6 @@ Changelog
 - **1.9.0** Improvements to interactive mode
 - **1.8.2** `generate_wordlist` behaviour didn't match docstring, fixed
 - **1.8.1** Fix typo in validation function
-- **1.8.0** Fix error in wordfile argument handling
 
 
 License

diff --git a/setup.py b/setup.py
index 5f331e92ff06f97110630a668ecdd2e2ffcf7fc2..077317f02b475b592e621bd5a2cc88260662c6c1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='xkcdpass',
-    version='1.11.1',
+    version='1.12.0',
     author='Steven Tobin',
     author_email='steventtobin@gmail.com',
     url='https://github.com/redacted/XKCD-password-generator',