summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/or/config.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c776db92e3..9c01aeb3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,8 +47,10 @@ Changes in version 0.2.0.20-?? - 2008-02-??
o Minor features (controller):
- Add a new __HashedControlSessionPassword option for controllers
- to use for one-off session password hashes that shouldn't get
- saved to disk by SAVECONF. Partial fix for bug 586.
+ to use for one-off session password hashes that shouldn't
+ get saved to disk by SAVECONF. Make Tor automatically convert
+ "HashedControlPassword" to this new option but only when it's
+ given on the command line. Partial fix for bug 586.
o Minor features (logging):
- When SafeLogging is disabled, log addresses along with all TLS
diff --git a/src/or/config.c b/src/or/config.c
index 6be55dd6df..0e21c596c1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -84,6 +84,7 @@ static config_abbrev_t _option_abbrevs[] = {
{ "SearchDomains", "ServerDNSSearchDomains", 0, 1},
{ "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
{ "BridgeAuthoritativeDirectory", "BridgeAuthoritativeDir", 0, 0},
+ { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0},
{ NULL, NULL, 0, 0},
};
/* A list of state-file abbreviations, for compatibility. */