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

[nickm@xxxxxxxxxxxxxx]

commit 6d0f332a2efe9d9493627081e02a1983d32c15a0
Merge: 6177674a5 f49876d66
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Nov 30 12:07:59 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.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         |  4 +++-
 src/or/routerlist.c          |  5 ++++-
 6 files changed, 44 insertions(+), 5 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits