Merge remote-tracking branch 'tor-github/pr/1349'

  o Major bugfixes (torrc):

    - Stop ignoring torrc options after an %include directive, when the

      included directory ends with a file that does not contain any config

      options. (But does contain comments or whitespace.)

      Fixes bug 31408; bugfix on 0.3.1.1-alpha.

  int rv = -1;

  SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) {

    config_line_t *included_config = NULL;

    config_line_t *included_config_last = NULL;

    if (config_get_included_config(config_file, recursion_level, extended,

                                   &included_config, list_last,

                                   &included_config, &included_config_last,

                                   opened_lst) < 0) {

      goto done;

    }

    *next = included_config;

    if (*list_last)

      next = &(*list_last)->next;

    if (included_config_last) {

      next = &included_config_last->next;

      *list_last = included_config_last;

    }

  } SMARTLIST_FOREACH_END(config_file);

  *list = ret_list;

  rv = 0;

Nickname test31408

ORPort 31408

Nickname test31408

# Bug 31048 is triggered when the last file in a config directory:

#   * contains no configuration options,

#   * but is non-empty: that is, it contains comments or whitespace.