commit fb47b90cc1e73f4d22d629c2fffe76d2488a7805 Merge: 6661c0352 ba4a9cf0c Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

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(-)