[tor-commits] [tor/release-0.2.2] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1

[arma@xxxxxxxxxxxxxx]

commit 7605985b3ff71cee7fabdf023baf298b218d04c1
Merge: 372773d a1073ee
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 22 15:54:13 2011 -0500

    Merge remote branch 'public/bug2402_nothing' into maint-0.2.1

 changes/bug2402 |    4 ++++
 src/or/config.c |   11 +----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --combined src/or/config.c
index 8397b23,c5d6540..209a92d
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -827,16 -827,7 +827,7 @@@ static char *_version = NULL
  const char *
  get_version(void)
  {
-   if (_version == NULL) {
-     if (strlen(tor_svn_revision)) {
-       size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
-       _version = tor_malloc(len);
-       tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
-     } else {
-       _version = tor_strdup(VERSION);
-     }
-   }
-   return _version;
+   return VERSION;
  }
  
  /** Release additional memory allocated in options
@@@ -2878,9 -2869,7 +2869,9 @@@ compute_publishserverdescriptor(or_opti
      else if (!strcasecmp(string, "bridge"))
        *auth |= BRIDGE_AUTHORITY;
      else if (!strcasecmp(string, "hidserv"))
 -      *auth |= HIDSERV_AUTHORITY;
 +      log_warn(LD_CONFIG,
 +               "PublishServerDescriptor hidserv is invalid. See "
 +               "PublishHidServDescriptors.");
      else if (!strcasecmp(string, "") || !strcmp(string, "0"))
        /* no authority */;
      else
@@@ -3370,11 -3359,6 +3361,11 @@@ options_validate(or_options_t *old_opti
                             "RelayBandwidthBurst", msg) < 0)
      return -1;
  
 +  if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
 +    options->RelayBandwidthBurst = options->RelayBandwidthRate;
 +  if (options->RelayBandwidthBurst && !options->RelayBandwidthRate)
 +    options->RelayBandwidthRate = options->RelayBandwidthBurst;
 +
    if (server_mode(options)) {
      if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
        r = tor_snprintf(buf, sizeof(buf),
@@@ -3406,6 -3390,9 +3397,6 @@@
      }
    }
  
 -  if (options->RelayBandwidthRate && !options->RelayBandwidthBurst)
 -    options->RelayBandwidthBurst = options->RelayBandwidthRate;
 -
    if (options->RelayBandwidthRate > options->RelayBandwidthBurst)
      REJECT("RelayBandwidthBurst must be at least equal "
             "to RelayBandwidthRate.");



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits