Merge branch 'bug32175'

changes/bug32175

@@ -0,0 +1,6 @@
+  o Minor bugfixes (tests):
+    - Our option-validation tests no longer depend on specially configured
+      non-default, non-passing set of options.  Previously, the tests had
+      been written to assume that options would _not_ be set to their
+      defaults, which led to needless complexity and verbosity.
+      Fixes bug 32175; bugfix on 0.2.8.1-alpha.

src/app/config/config.c

@@ -3328,6 +3328,10 @@ options_validate_scheduler(or_options_t *options, char **msg)
            "can be used or set at least one value.");
   }
   /* Ok, we do have scheduler types, validate them. */
+  if (options->SchedulerTypes_) {
+    SMARTLIST_FOREACH(options->SchedulerTypes_, int *, iptr, tor_free(iptr));
+    smartlist_free(options->SchedulerTypes_);
+  }
   options->SchedulerTypes_ = smartlist_new();
   SMARTLIST_FOREACH_BEGIN(options->Schedulers, const char *, type) {
     int *sched_type;