commit 2393e67b2e5e474b3fd2a161fddb01e246991881 Merge: e891638 05ec055 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:41:33 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

changes/bug17404 | 6 ++++++ changes/bug18089 | 6 ++++++ src/common/crypto.c | 10 ++++++++++ src/common/tortls.c | 4 ++++ 4 files changed, 26 insertions(+)