Merge remote branch 'origin/maint-0.2.2'

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

1 files changed, 8 insertions, 0 deletions

diff --git a/src/or/policies.c b/src/or/policies.c
index d0406d3889..2cf99820b1 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -875,6 +875,14 @@ policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest,
   return 0;
 }
 
+/** Add "reject *:*" to the end of the policy in *<b>dest</b>, allocating
+ * *<b>dest</b> as needed. */
+void
+policies_exit_policy_append_reject_star(smartlist_t **dest)
+{
+  append_exit_policy_string(dest, "reject *:*");
+}
+
 /** Replace the exit policy of <b>node</b> with reject *:* */
 void
 policies_set_node_exitpolicy_to_reject_all(node_t *node)