From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 14 Apr 2017 22:27:50 +0000 (+0100)
Subject: Merge branch '2.3.x'
X-Git-Tag: 2.4.0~61
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb/commitdiff_plain/91f56a78e497b97c996cc46c7e7aff487a0b68bd

Merge branch '2.3.x'

* 2.3.x:
  symm/salsa20.[ch]: Add missing LGPL notices.
  math/mpx-mul4-test.c: Set `dstr' length correctly in conversion function.
  symm/chacha.c: Fix `tell' response.
  symm/chacha.[ch]: Fix comment headers.
  symm/{chacha.c,salsa20.c}: Fix random generator allocation sizes.
---

91f56a78e497b97c996cc46c7e7aff487a0b68bd