commit 733ce556ad6a59a111b63a860904799c30513a24 Merge: c0f0351 3f94041 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 18:21:46 2017 -0400

Merge branch 'asn_bug22006_final_squashed'

src/common/crypto_ed25519.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)