commit 428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7
Merge: 2f5202c 8589c47
Author: Nick Mathewson <[email protected]>
Date: Wed Aug 19 13:36:59 2015 -0400
Merge branch 'ed25519_keygen_squashed'
Makefile.am | 2 +
changes/16679_16685_etc | 13 ++
src/or/config.c | 39 +++++
src/or/main.c | 4 +-
src/or/or.h | 7 +
src/or/routerkeys.c | 238 ++++++++++++++++++++++++++-----
src/or/routerkeys.h | 1 +
src/test/include.am | 2 +-
src/test/test_keygen.sh | 363 +++++++++++++++++++++++++++++++++++++++++++++++
9 files changed, 634 insertions(+), 35 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
