Resume expanding abbreviations for command-line options
commit37a76d75dd38a1ebd45627bb6e29e40f60917188
authorRoger Dingledine <arma@torproject.org>
Wed, 27 Aug 2014 10:10:35 +0000 (27 06:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Aug 2014 12:33:43 +0000 (28 08:33 -0400)
tree82b416e4f8f917ab7081037afad721f97415ef2b
parentb159ffb675a274b285acc55204eaf6e83cd72bf8
Resume expanding abbreviations for command-line options

The fix for bug 4647 accidentally removed our hack from bug 586 that
rewrote HashedControlPassword to __HashedControlSessionPassword when
it appears on the commandline (which allowed the user to set her own
HashedControlPassword in the torrc file while the controller generates
a fresh session password for each run).

Fixes bug 12948; bugfix on 0.2.5.1-alpha.
changes/bug12948 [new file with mode: 0644]
src/or/config.c