commit f1cbb09e35b9f5fdea2aa1ebae77ed45096fc7ae
Merge: b1c543cf4 5fc0587c0
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.3.0' into release-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 ++++++
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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
