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

diff --cc src/or/config.c
index 4c7fa6d4c61401c5ffe531d398e5a66e6fabff4e,f97e9b1beaaa35f2ab8ed6eba60cb255ea8fdc37..07053a17ef631a204971bbd199c628c284f18cb9
--- 1/src/or/config.c
--- 2/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. */

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