[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 62ee4f185f984f11d75522eedcee92d1f15fc7a6
Merge: 06d99aa 9ebe202
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 20 19:30:45 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug20103       |  7 +++++++
 src/or/networkstatus.c | 24 +++++++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --cc src/or/networkstatus.c
index 72af505,1cedfef..28f5b42
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@@ -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) {