[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit 2461ea1faa20fc435bdf786147afe99207366c29
Merge: d478704 542cc8a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 08:17:34 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17398            |    3 +++
 src/common/crypto_ed25519.c |    1 +
 2 files changed, 4 insertions(+)