[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm at torproject.org]

commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e
Merge: 3030741b5 f49876d66
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:07:59 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/trove-2017-009       | 10 ++++++++++
 changes/trove-2017-011       |  8 ++++++++
 changes/trove-2017-012-part1 |  6 ++++++
 src/common/crypto.c          | 16 +++++++++++++---
 src/or/rendservice.c         |  4 +++-
 src/or/routerlist.c          |  5 ++++-
 6 files changed, 44 insertions(+), 5 deletions(-)