diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-02-22 23:20:28 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-02-22 23:20:28 +0000 |
| commit | cd4b95e402d5d01694fade9d4177ecce30104cd6 (patch) | |
| tree | 106dc50825133b39709b291c10f5856e3bedf3dd | |
| parent | 7589765ae94291f1bc6ed9c7bd4dd24b7c9b9f09 (diff) | |
| download | tor-cd4b95e402d5d01694fade9d4177ecce30104cd6.tar.gz tor-cd4b95e402d5d01694fade9d4177ecce30104cd6.zip | |
Make "HashedControlPassword" an alias for "__HashedControlSessionPassword"
if it appears on the commandline. should help with bug 586.
svn:r13683
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 5 insertions, 2 deletions
@@ -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. */ |