Merge remote-tracking branch 'sysrqb/bug15220_026_sysrqb'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
index 2f656647e72340db1118bc7ae8976f1a309b1130,9c02f0c7787ebd99653ffb221f6cbd6cc895f75e..e686f61a263941550c9c92b3f99e78eceb4bc6b4
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -556,9 -545,12 +556,10 @@@ static char *get_bindaddr_from_transpor
  static int parse_dir_authority_line(const char *line,
                                   dirinfo_type_t required_type,
                                   int validate_only);
 -static int parse_dir_fallback_line(const char *line,
 -                                   int validate_only);
  static void port_cfg_free(port_cfg_t *port);
  static int parse_ports(or_options_t *options, int validate_only,
-                               char **msg_out, int *n_ports_out);
+                               char **msg_out, int *n_ports_out,
+                               int *world_writable_control_socket);
  static int check_server_ports(const smartlist_t *ports,
                                const or_options_t *options);
  
@@@ -2662,6 -2587,10 +2663,7 @@@ options_validate(or_options_t *old_opti
    config_line_t *cl;
    const char *uname = get_uname();
    int n_ports=0;
 -  int world_writable_control_socket;
 -#define REJECT(arg) \
 -  STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
 -#define COMPLAIN(arg) STMT_BEGIN log_warn(LD_CONFIG, arg); STMT_END
++  int world_writable_control_socket=0;
  
    tor_assert(msg);
    *msg = NULL;

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/or.h
Simple merge