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

[nickm at torproject.org]

commit 7e2b012b46a4ade2818e47be15d76255cf6f121e
Merge: 52d7af631 ba4a9cf0c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:07:59 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug24313             |  5 +++++
 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         |  8 +++++++-
 src/or/routerlist.c          |  5 ++++-
 7 files changed, 53 insertions(+), 5 deletions(-)