From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 May 2011 19:51:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d274f539e5ae8ffe50f2bb364c3a3b64e3920e9c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

d274f539e5ae8ffe50f2bb364c3a3b64e3920e9c
diff --cc src/or/config.c
index 4c7fa6d4c6,f97e9b1bea..07053a17ef
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -2124,8 -2064,8 +2124,9 @@@ get_assigned_option(config_format_t *fm
          escape_val = 0;
          break;
        }
+       /* fall through */
      case CONFIG_TYPE_INTERVAL:
 +    case CONFIG_TYPE_MSEC_INTERVAL:
      case CONFIG_TYPE_UINT:
        /* This means every or_options_t uint or bool element
         * needs to be an int. Not, say, a uint16_t or char. */