commit d8d52f2b73eca2cfa868d157bdb66d5ba1be5c30 Merge: 14746dfba ee48eb1eb Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug24313 | 5 +++++ changes/trove-2017-009 | 10 ++++++++++ changes/trove-2017-010 | 6 ++++++ changes/trove-2017-011 | 8 ++++++++ changes/trove-2017-012-part1 | 6 ++++++ changes/trove-2017-012-part2 | 5 +++++ src/common/crypto.c | 16 +++++++++++++--- src/or/entrynodes.c | 3 ++- src/or/protover.c | 5 +++++ src/or/rendservice.c | 8 +++++++- src/or/routerlist.c | 5 ++++- 11 files changed, 71 insertions(+), 6 deletions(-)