commit 911fb9399fdd88a51222779268ffc55ab12a18ac
Merge: dd4f5bc 71c62b1
Author: Roger Dingledine <[email protected]>
Date: Thu Jul 24 16:22:36 2014 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
changes/curve25519-donna32-bug | 12 ++
changes/ticket12688 | 6 +
doc/tor.1.txt | 8 +-
src/ext/curve25519_donna/curve25519-donna.c | 292 ++++++++++++++++++++-------
src/or/config.c | 5 +-
src/or/entrynodes.c | 20 +-
6 files changed, 257 insertions(+), 86 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
