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

[nickm at torproject.org]

commit 3c0150aa46658366bcfe2e65ed53d6a075d42698
Merge: 70fcbd5f8 1d5e693b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 20:36:04 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket22895                           | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)