From 5cc74e1927febd9ac1dcabb24291b140fc20fcaf Mon Sep 17 00:00:00 2001
From: FSX <frank@61924.nl>
Date: Sat, 1 Dec 2018 10:49:01 +0100
Subject: [PATCH] Update documents.

---
 LICENSE.txt        |  2 +-
 README.rst         |  4 ++--
 THANKS             |  1 +
 docs/changelog.rst | 13 +++++++++++++
 docs/conf.py       |  6 +++---
 setup.py           |  6 ++----
 tox.ini            |  3 +--
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 078c6c8..68d36fe 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2011-2015 by Frank Smit <frank@61924.nl>
+Copyright (C) 2011-2018 by Frank Smit <frank@61924.nl>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.rst b/README.rst
index ec5a5ec..523d4e7 100644
--- a/README.rst
+++ b/README.rst
@@ -20,8 +20,8 @@ Documentation can be found at: http://misaka.61924.nl/
 Installation
 ------------
 
-Misaka has been tested on CPython 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 and PyPy 2.6. It needs
-CFFI 1.0 or newer, because of this it will not work on PyPy 2.5 and older.
+Misaka has been tested on CPython 2.7, 3.2, 3.4, 3.5, 3.6, 3.7 and PyPy 2.7 and 3.5.
+It needs CFFI 1.0 or newer, because of this it will not work on PyPy 2.5 and older.
 
 With pip::
 
diff --git a/THANKS b/THANKS
index ecfcb0e..8017f2b 100644
--- a/THANKS
+++ b/THANKS
@@ -11,3 +11,4 @@ People who contributed code and fixed bugs:
 - sprin
 - graphicore
 - samuelcolvin
+- mlinhard
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8c91142..723d12c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,19 @@ Changelog
 
 Date format is year-month-day.
 
+2.1.1 (2018-12-01)
+^^^^^^^^^^^^^^^^^^
+
+- Fixed segfault caused by missing NULL-check (`#67`_).
+
+
+NOTE: Misaka doesn't work in Python 2.6 anymore, because pycparser,
+a dependency of CFFI, doesn't work in Python 2.6 anymore.
+
+
+.. _#67: https://github.com/FSX/misaka/issues/67
+
+
 2.1.0 (2017-01-15)
 ^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/conf.py b/docs/conf.py
index fec554c..648335c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 
 # General information about the project.
 project = u'Misaka'
-copyright = u'2011-2017, Frank Smit'
+copyright = u'2011-2018, Frank Smit'
 author = u'Frank Smit'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1.0'
+version = '2.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index b60a4ad..e639146 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ def run(self):
 
 setup(
     name='misaka',
-    version='2.1.0',
+    version='2.1.1',
     description='A CFFI binding for Hoedown, a markdown parsing library.',
     author='Frank Smit',
     author_email='frank@61924.nl',
@@ -58,13 +58,11 @@ def run(self):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: C',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Text Processing :: Markup',
diff --git a/tox.ini b/tox.ini
index 6c4419f..31eda50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,8 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, pypy
+envlist = py27, py32, py33, py34, py35, py36, py37, pypy
 
 [testenv]
 commands = {envpython} setup.py test
 deps =
-