commit 2b26815e09760cc84b18791bdbfca27c7b8334f4 Merge: c894e9d3d 6cd5a8027 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 11 17:49:18 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/bug22446 | 4 +++ src/ext/csiphash.c | 14 +++++----- src/ext/ed25519/donna/modm-donna-32bit.h | 48 ++++++++++++++++---------------- src/ext/ed25519/donna/modm-donna-64bit.h | 24 ++++++++-------- src/or/buffers.c | 1 + src/or/connection_edge.c | 1 + src/or/dns.c | 1 + src/or/relay.c | 1 + 8 files changed, 51 insertions(+), 43 deletions(-)