Merge remote-tracking branch 'sebastian/pure_removal'

This commit is contained in:
Nick Mathewson
2011-11-25 14:54:04 -05:00
6 changed files with 47 additions and 52 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ setopt_err_t options_trial_assign(config_line_t *list, int use_defaults,
int clear_first, char **msg);
int resolve_my_address(int warn_severity, const or_options_t *options,
uint32_t *addr, char **hostname_out);
int is_local_addr(const tor_addr_t *addr) ATTR_PURE;
int is_local_addr(const tor_addr_t *addr);
void options_init(or_options_t *options);
char *options_dump(const or_options_t *options, int minimal);
int options_init_from_torrc(int argc, char **argv);