merge office-safe fixes

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 06959f11e67a2d6f418c4bd63d75997740676b78..bbf225b6c53e9872559ed9cafc4eb4387c8dd850 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -21,3 +21,4 @@ Justin Findlay <jfindlay@gmail.com>
 Timothy McFadden <mtik00@users.noreply.github.com>
 Edward Betts <edward@4angle.com>
 Jakub Wilk <jwilk@jwilk.net>
+Dan Rosenbloom <drosenbloom@logicworks.net>

diff --git a/README.rst b/README.rst
index 1de7a65adbe0a8cba83a8988f6f4c0fd2caf6bff..e9025c4b3c7abf5e4ecea57a2032dc4ca199aa26 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -164,6 +164,7 @@ An important caveat: due to the significant reduction in the size of the filtere
 
 Changelog
 =========
+- **1.9.4** Improve office-safe wordlist contents
 - **1.9.3** Link EFF wordlist information, fix typos, update copyright
 - **1.9.2** Added Debian cracklib path
 - **1.9.1** Fixed typo in example
@@ -173,7 +174,6 @@ Changelog
 - **1.8.0** Fix error in wordfile argument handling
 - **1.7.0** require explicit permission to fall back to insecure PRNG
 - **1.6.4** fix broken link in README
-- **1.6.3** ensure deduplication of wordlist
 
 
 License

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