Merge branch 'release/2.1.8'

CHANGELOG.rst

@@ -25,16 +25,26 @@ the functionality yourself.
 Current release
 ---------------
 
-.. _2.1.6:
+2.1.8
+=====
 
-- Introduced the ability to use `uvloop
-  <https://github.com/MagicStack/uvloop>`_ in place of the default
-  :py:obj:`asyncio.event_loop`.
+.. _2.1.8:
+
+- Mostly a bugfix release.
+- Added new command ``blackhole_config`` to display config options on command
+  line.
 
 -------------
 Past releases
 -------------
 
+.. _2.1.7:
+.. _2.1.6:
+
+- Introduced the ability to use `uvloop
+  <https://github.com/MagicStack/uvloop>`_ in place of the default
+  :py:obj:`asyncio.event_loop`.
+
 .. _2.1.4:
 .. _2.1.5:
 

blackhole/__init__.py

@@ -50,7 +50,7 @@
 __copyright__ = 'None'
 __credits__ = ('Kura', )
 __license__ = 'MIT'
-__version__ = '2.1.7'
+__version__ = '2.1.8'
 __maintainer__ = 'Kura'
 __email__ = '[email protected]'
 __status__ = 'Stable'

docs/source/configuration.rst

@@ -39,7 +39,7 @@ as below:
 -t			perform a configuration test and exit
 -d			enable debugging mode
 -b			run in the background
--ls			Disable :ssl.OP_SINGLE_DH_USE and ssl.OP_SINGLE_ECDH_USE.
+-ls			Disable :py:obj:`ssl.OP_SINGLE_DH_USE` and :py:obj:`ssl.OP_SINGLE_ECDH_USE`.
 			Reduces CPU overhead at the expense of security. Don't use this
 			option unless you really need to. -- added in :ref:`2.0.13`
 -q			Suppress warnings when using -ls/--less-secure, running as root or
@@ -54,6 +54,9 @@ Configuration options
 Here are all available options for the configuration file, their default values
 and information on what the options actually do.
 
+From :ref:`2.1.8` onwards the ``blackhole_config`` command will also display this
+information directly from the command line.
+
 - `listen`_
 - `tls_listen`_
 - `user`_