tmp
Fix for bug 9295: Don't crash when running --hash-password.

Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're
considering #9122 for an 0.2.3 backport, and if we do, we should merge
this too.
Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'