Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/config.c

diff --cc src/or/config.c
index fa2eb73bebef98dfd0073b2f1d2e4c6704a02952,d66f9136b768b4899c4e6455854ab7080693a61e..6d8addeb2d08f14dc4900b85865f48052bcf8794
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -1231,17 -1231,18 +1231,29 @@@ options_act(or_options_t *old_options
    if (accounting_is_enabled(options))
      configure_accounting(time(NULL));
  
 +#ifdef USE_BUFFEREVENTS
 +  /* If we're using the bufferevents implementation and our rate limits
 +   * changed, we need to tell the rate-limiting system about it. */
 +  if (!old_options ||
 +      old_options->BandwidthRate != options->BandwidthRate ||
 +      old_options->BandwidthBurst != options->BandwidthBurst ||
 +      old_options->RelayBandwidthRate != options->RelayBandwidthRate ||
 +      old_options->RelayBandwidthBurst != options->RelayBandwidthBurst)
 +    connection_bucket_init();
 +#endif
 +
+   /* parse RefuseUnknownExits tristate */
+   if (!strcmp(options->RefuseUnknownExits, "0"))
+     options->RefuseUnknownExits_ = 0;
+   else if (!strcmp(options->RefuseUnknownExits, "1"))
+     options->RefuseUnknownExits_ = 1;
+   else if (!strcmp(options->RefuseUnknownExits, "auto"))
+     options->RefuseUnknownExits_ = -1;
+   else {
+     /* Should have caught this in options_validate */
+     return -1;
+   }
+ 
    /* Change the cell EWMA settings */
    cell_ewma_set_scale_factor(options, networkstatus_get_latest_consensus());
  

diff --cc src/or/connection_edge.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/or.h
Simple merge