From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Sep 2010 21:52:20 +0000 (-0400)
Subject: Merge remote branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af7fab020accd31f95ba2037ccd25c65e3290571;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/or/config.c
---

af7fab020accd31f95ba2037ccd25c65e3290571
diff --cc src/or/config.c
index fa2eb73beb,d66f9136b7..6d8addeb2d
--- a/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());