Merge remote-tracking branch 'linus/bug10324'

This commit is contained in:
Nick Mathewson
2013-12-20 11:40:21 -05:00
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -0,0 +1,2 @@
o Tool changes:
- Make tor-gencert create 2048 bit signing keys. Addresses ticket #10324.
+1 -1
View File
@@ -34,7 +34,7 @@
#include "address.h"
#define IDENTITY_KEY_BITS 3072
#define SIGNING_KEY_BITS 1024
#define SIGNING_KEY_BITS 2048
#define DEFAULT_LIFETIME 12
/* These globals are set via command line options. */