From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 14 May 2017 03:28:02 +0000 (+0100)
Subject: Merge branch '1.1.x'
X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/commitdiff_plain/c5d395fadbfd59e0744953042acfd6a5b56db919

Merge branch '1.1.x'

* 1.1.x:
  Release 1.1.2.
  catacomb/__init__.py: Fix up cipher etc. names better.
  algorithms.c: Support the new 16-bit key-size descriptors.
  group.c: Track Catacomb group internals change.
  utils.c: Raise exceptions from `convTHING' with null arguments.
  Return `long' objects when `int' is requested but the value won't fit.
  bytestring.c: Check for cached hash more carefully.
  rand.c: Careful range checking on `block' and `mp'.
  *.c: Fix docstrings for methods.
  Further fixing to use `Py_ssize_t' in place of int.

Conflicts:
	debian/control (already wanted later catacomb-dev)
	group.c (no need for compatibility with older Catacombs)
---

c5d395fadbfd59e0744953042acfd6a5b56db919