commit 212d984dc50668adbbd770d4af9185ca8bcaefbf Merge: 5b336f2 cc34ba1 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 10:06:25 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug20865 | 7 +++++++ src/common/crypto.c | 9 +++++++++ 2 files changed, 16 insertions(+)