[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 06be6105e45eca8ce3ad24e58652ad3faa083c92
Merge: 14552a1 d79d648
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 17 12:00:44 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/config.c

 changes/bug3747     |    6 ++++++
 src/or/config.c     |    3 +++
 src/or/connection.c |    3 ---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc src/or/config.c
index 315884c,7202ea2..716d83a
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -1120,7 -1034,10 +1120,10 @@@ options_act_reversible(const or_options
      /* No need to roll back, since you can't change the value. */
    }
  
+   /* Write control ports to disk as appropriate */
+   control_ports_write_to_file();
+ 
 - if (directory_caches_v2_dir_info(options)) {
 +  if (directory_caches_v2_dir_info(options)) {
      size_t len = strlen(options->DataDirectory)+32;
      char *fn = tor_malloc(len);
      tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status",