commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33 Merge: d459c08b7 7e2b012b4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24313 | 5 +++++ changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-010 | 6 ++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ src/common/crypto.c | 16 +++++++++++++--- src/or/protover.c | 5 +++++ src/or/rendservice.c | 8 +++++++- src/or/routerlist.c | 5 ++++- 9 files changed, 64 insertions(+), 5 deletions(-)