aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-28 08:36:00 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-28 08:36:00 -0400
commitcc3b04a8c1edbeb1a488e319e3c0d28acd227417 (patch)
tree8a893eb08c9593e909cc5d1e9d0ca582ecad777e /changes
parent9f9b19ed7b06d8313a9bcbd6647fa097ec0a059d (diff)
parent37a76d75dd38a1ebd45627bb6e29e40f60917188 (diff)
downloadtor-cc3b04a8c1edbeb1a488e319e3c0d28acd227417.tar.gz
tor-cc3b04a8c1edbeb1a488e319e3c0d28acd227417.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug129488
1 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug12948 b/changes/bug12948
new file mode 100644
index 0000000000..431c0a1019
--- /dev/null
+++ b/changes/bug12948
@@ -0,0 +1,8 @@
+ o Major bugfixes:
+ - 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.