]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Sep 2016 23:30:45 +0000 (19:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Sep 2016 23:30:45 +0000 (19:30 -0400)
1  2 
src/or/networkstatus.c

index 72af505d1959aa5cf5fed7cbc99f383bb72889d6,1cedfef9b77096f019dba25623c5ecccefc9e04e..28f5b42799d673c6a2efee849e001dee1ae2a50e
@@@ -1731,9 -1629,11 +1731,11 @@@ networkstatus_set_current_consensus(con
  
    /* Are we missing any certificates at all? */
    if (r != 1 && dl_certs)
 -    authority_certs_fetch_missing(c, now);
 +    authority_certs_fetch_missing(c, now, source_dir);
  
-   if (flav == usable_consensus_flavor()) {
+   const int is_usable_flavor = flav == usable_consensus_flavor();
+   if (is_usable_flavor) {
      notify_control_networkstatus_changed(current_consensus, c);
    }
    if (flav == FLAV_NS) {