2 - Resume expanding abbreviations for command-line options. The fix
3 for bug 4647 accidentally removed our hack from bug 586 that rewrote
4 HashedControlPassword to __HashedControlSessionPassword when it
5 appears on the commandline (which allowed the user to set her
6 own HashedControlPassword in the torrc file while the controller
7 generates a fresh session password for each run). Fixes bug 12948;
8 bugfix on 0.2.5.1-alpha.