diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 16:48:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 16:48:03 -0400 |
| commit | 80b9a589bb351659252faa9793176ada6c9ce914 (patch) | |
| tree | 5a96186db7aa9023236a92920fa91b4c8cf0bf81 /src/or/networkstatus.c | |
| parent | 2f269bfaf1d1d89324e8936425bf19bb64bcb06e (diff) | |
| parent | 1a181a476e623cd6c1bc71173bb2d3d769aa1325 (diff) | |
| download | tor-80b9a589bb351659252faa9793176ada6c9ce914.tar.gz tor-80b9a589bb351659252faa9793176ada6c9ce914.zip | |
Merge remote-tracking branch 'dgoulet/ticket25914_034_01'
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 7579893421..44c0638c2b 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1858,17 +1858,9 @@ networkstatus_set_current_consensus(const char *consensus, current_valid_after = current_md_consensus->valid_after; } } else { - cached_dir_t *cur; - char buf[128]; - tor_snprintf(buf, sizeof(buf), "cached-%s-consensus", flavor); - consensus_fname = get_cachedir_fname(buf); - tor_snprintf(buf, sizeof(buf), "unverified-%s-consensus", flavor); - unverified_fname = get_cachedir_fname(buf); - cur = dirserv_get_consensus(flavor); - if (cur) { - current_digests = &cur->digests; - current_valid_after = cur->published; - } + tor_assert_nonfatal_unreached(); + result = -2; + goto done; } if (current_digests && |