diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-14 10:18:18 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-14 10:18:23 +0100 |
| commit | c1b7421781b7a53485c6db4a6005a80e32267c9f (patch) | |
| tree | c6cab5ae1ea5041502b2865f08fe05dd9b147e4c /src/torcontrol.cpp | |
| parent | ec0afbd52b787ac0c8d49ad1b6c9dfa98d725b03 (diff) | |
| parent | d6098956c34719cd833a645b21d3d8f1be0a9d17 (diff) | |
Merge #9211: [0.12 branch] Backportsv0.12-final
d609895 [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli)
8dee97f [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli)
82e29e8 torcontrol: Explicitly request RSA1024 private key (Wladimir J. van der Laan)
cca151b Send tip change notification from invalidateblock (Russell Yanofsky)
ad99a79 [rpcwallet] Don't use floating point (MarcoFalke)
Diffstat (limited to 'src/torcontrol.cpp')
| -rw-r--r-- | src/torcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 0a68d2348d..6d64be91d5 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -465,7 +465,7 @@ void TorController::auth_cb(TorControlConnection& conn, const TorControlReply& r // Finally - now create the service if (private_key.empty()) // No private key, generate one - private_key = "NEW:BEST"; + private_key = "NEW:RSA1024"; // Explicitly request RSA1024 - see issue #9214 // Request hidden service, redirect port. // Note that the 'virtual' port doesn't have to be the same as our internal port, but this is just a convenient // choice. TODO; refactor the shutdown sequence some day. |