Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/policies.c
	src/or/policies.h

1 files changed, 1 insertions, 0 deletions

diff --git a/src/or/policies.h b/src/or/policies.h
index 371123c1e8..ee1162ccc2 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -48,6 +48,7 @@ addr_policy_result_t compare_tor_addr_to_node_policy(const tor_addr_t *addr,
 int policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest,
                                int rejectprivate, const char *local_address,
                                int add_default_policy);
+void policies_exit_policy_append_reject_star(smartlist_t **dest);
 void policies_set_node_exitpolicy_to_reject_all(node_t *exitrouter);
 int exit_policy_is_general_exit(smartlist_t *policy);
 int policy_is_reject_star(const smartlist_t *policy);