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

[nickm at torproject.org]

commit ff174995f07747628ad1e71fd344fc27e88a70ed
Merge: fbaee1b 5d45a26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 11:06:47 2015 -0400

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/bug17398            |  3 +++
 changes/bug17401            |  3 +++
 changes/bug17402            |  3 +++
 src/common/crypto_ed25519.c |  1 +
 src/or/rendcache.c          | 24 ++++++++++++++++--------
 5 files changed, 26 insertions(+), 8 deletions(-)