commit b84815881f92a0a301a0e7b54fcc685b950a6845 Merge: dbb9ec494 1b9bb2c84 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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