tor

commit 0b4e59b7c6d28565bdea773a9711571acd81d85d
parent 45fb624e38a3bc000be4fd7fa98378644f3d9756
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 13 Nov 2017 11:32:35 -0500

Merge remote-tracking branch 'sebastian/bug24137'

Diffstat:
A
changes/bug24137
 | 
3
+++
M
src/or/dirserv.c
 | 
12
+++++++++---

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/changes/bug24137 b/changes/bug24137
@@ -0,0 +1,3 @@
+  o Minor bugfixes (Private Networks):
+   - Give out Exit flags in bootstrapping networks. Fixes bug 24137;
+     bugfix on 0.2.3.1-alpha.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
@@ -1519,15 +1519,21 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil)
         node->ri &&
         node->ri->purpose != ROUTER_PURPOSE_BRIDGE)
       continue;
+
+    routerinfo_t *ri = node->ri;
+    if (ri) {
+      node->is_exit = (!router_exit_policy_rejects_all(ri) &&
+                       exit_policy_is_general_exit(ri->exit_policy));
+    }
+
     if (router_counts_toward_thresholds(node, now, omit_as_sybil,
                                         require_mbw)) {
-      routerinfo_t *ri = node->ri;
       const char *id = node->identity;
       uint32_t bw_kb;
+
       /* resolve spurious clang shallow analysis null pointer errors */
       tor_assert(ri);
-      node->is_exit = (!router_exit_policy_rejects_all(ri) &&
-                       exit_policy_is_general_exit(ri->exit_policy));
+
       uptimes[n_active] = (uint32_t)real_uptime(ri, now);
       mtbfs[n_active] = rep_hist_get_stability(id, now);
       tks  [n_active] = rep_hist_get_weighted_time_known(id, now);