Commit 7ac8a4a0 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents deaf30a8 93b73017

changes/bug6397

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - When disabling guards for having too high a proportion of failed

      circuits, make sure to look at each guard. Fix for bug 6397; bugfix

      on 0.2.3.17-beta.

changes/cov709056

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Check return value of fputs() when writing authority certificate

      file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha.

src/or/circuitbuild.c

+5 −5
Original line number Diff line number Diff line
@@ -4728,8 +4728,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) 
    }

  }



  SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e,

   {

  SMARTLIST_FOREACH_BEGIN(new_entry_guards, entry_guard_t *, e) {

     char *sp;

     char *val = digestmap_get(added_by, e->identity);

     if (val && (sp = strchr(val, ' '))) {
@@ -4747,9 +4746,10 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) 
         e->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30);

       }

     }

     if (node->path_bias_disabled && !node->bad_since)

       node->bad_since = time(NULL);

   });

     if (e->path_bias_disabled && !e->bad_since)

       e->bad_since = time(NULL);

    }

  SMARTLIST_FOREACH_END(e);



  if (*msg || !set) {

    SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e,

src/tools/tor-gencert.c

+6 −1
Original line number Diff line number Diff line
@@ -497,7 +497,12 @@ generate_certificate(void) 
    return 1;

  }



  fputs(buf, f);

  if (fputs(buf, f) < 0) {

    log_err(LD_GENERAL, "Couldn't write to %s: %s",

            certificate_file, strerror(errno));

    fclose(f);

    return 1;

  }

  fclose(f);

  return 0;

}