summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-23 09:09:30 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:06:15 -0500
commit897626953b15ac216d27b3814804524caa9fdd1c (patch)
tree12b309026b95dbd855546e1e02968e34a03376cd /src/or/main.c
parent8edd3d2b6c43bd5eb64d79177e6e4c44ca4fc618 (diff)
downloadtor-897626953b15ac216d27b3814804524caa9fdd1c.tar.gz
tor-897626953b15ac216d27b3814804524caa9fdd1c.zip
Rebuild the guard lists as appropriate on torrc change.
(Also, prepare to tie guard changes into the mark-all-old-circuits logic.)
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 65d1c1fd79..16106612a9 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -979,7 +979,10 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs)
/* if we have enough dir info, then update our guard status with
* whatever we just learned. */
- guards_update_all();
+ int invalidate_circs = guards_update_all();
+ // This shouldn't be able to occur at this point.
+ tor_assert_nonfatal(! invalidate_circs);
+
/* Don't even bother trying to get extrainfo until the rest of our
* directory info is up-to-date */
if (options->DownloadExtraInfo)