[tor-commits] [vidalia/master] Fold in more changes

[chiiph at torproject.org]

commit 13969f9f15ab8409d0031795a4f6672465ec4b02
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Sun Jan 29 11:38:58 2012 -0300

    Fold in more changes
---
 CHANGELOG |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5c07097..7252f80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,8 @@
     the validation is now delegated to Tor through SETCONF.
   o Explicitly disable SocksPort auto by setting it to its default
     (9050). Fixes bug 4598.
+  o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means
+    the user can't write the torrc file. Fixes bug 4833.
 
 0.2.15  07-Oct-2011
   o Draw the bandwidth graph curves based on the local maximum, not