commit d274f539e5ae8ffe50f2bb364c3a3b64e3920e9c Merge: fa1d472 d35a555 Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 15:51:46 2011 -0400

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

changes/bug3289 | 5 +++++ src/or/config.c | 3 ++- src/or/rendservice.c | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-)

diff --cc src/or/config.c index 4c7fa6d,f97e9b1..07053a1 --- 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. */