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

[nickm at torproject.org]

commit dfe80c966d5136bc4f3287f4f762384ecc4df0c5
Merge: 641c158 5c200d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 23 21:28:58 2014 -0400

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

 changes/curve25519-donna32-bug              |   12 ++
 src/ext/curve25519_donna/curve25519-donna.c |  292 ++++++++++++++++++++-------
 2 files changed, 228 insertions(+), 76 deletions(-)