aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 11:44:51 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 11:44:51 -0400
commit37e3fb8af20b02f764d0993218ed6025448073dd (patch)
tree956927bb08f18e3f050cafdbc9c0c1f54a083d28 /src/or/connection_edge.h
parent2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e (diff)
parentf2871009346e0589455be14e9cef930c19082c0a (diff)
downloadtor-37e3fb8af20b02f764d0993218ed6025448073dd.tar
tor-37e3fb8af20b02f764d0993218ed6025448073dd.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/connection_edge.c
Diffstat (limited to 'src/or/connection_edge.h')
-rw-r--r--src/or/connection_edge.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index 562db5b68..11b25f0c8 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -64,6 +64,7 @@ int address_is_invalid_destination(const char *address, int client);
void addressmap_init(void);
void addressmap_clear_excluded_trackexithosts(or_options_t *options);
+void addressmap_clear_invalid_automaps(or_options_t *options);
void addressmap_clean(time_t now);
void addressmap_clear_configured(void);
void addressmap_clear_transient(void);