diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:12:16 -0400 |
| commit | 1aab5b6b391ca179d9acded9465ee4941ec4700b (patch) | |
| tree | d9f4426a604f0f75e8a422b0f4e8181776374124 /src/or/config.c | |
| parent | 9a6642f6f5681fe92b17b87304126d2a3b2dec02 (diff) | |
| parent | 16c5a62a66098274dde726c8e02110238866fe0b (diff) | |
| download | tor-1aab5b6b391ca179d9acded9465ee4941ec4700b.tar.gz tor-1aab5b6b391ca179d9acded9465ee4941ec4700b.zip | |
Merge remote-tracking branch 'public/bug1666'
Conflicts:
doc/spec/socks-extensions.txt
src/or/buffers.c
src/or/config.c
src/or/connection_edge.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 4a9d2c9fbd..cdf0122f75 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -571,7 +571,6 @@ static int options_transition_affects_workers( static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); static int check_nickname_list(const char *lst, const char *name, char **msg); -static void config_register_addressmaps(const or_options_t *options); static int parse_bridge_line(const char *line, int validate_only); static int parse_client_transport_line(const char *line, int validate_only); @@ -4430,7 +4429,7 @@ get_torrc_fname(void) /** Adjust the address map based on the MapAddress elements in the * configuration <b>options</b> */ -static void +void config_register_addressmaps(const or_options_t *options) { smartlist_t *elts; |