diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-27 18:28:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-27 18:28:34 -0400 |
| commit | 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8 (patch) | |
| tree | 0ceadb7aece3f75e1f52f367216b0955a5d4f1f0 /src/or/dirserv.c | |
| parent | 32eba3d6aa7bd39048d32a566d119c013e526759 (diff) | |
| parent | 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 (diff) | |
| download | tor-2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8.tar.gz tor-2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8.zip | |
Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 408f58b22b..4954471c6a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -14,6 +14,7 @@ #include "connection.h" #include "connection_or.h" #include "conscache.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -3518,6 +3519,11 @@ spooled_resource_estimate_size(const spooled_resource_t *spooled, } else { cached_dir_t *cached; if (spooled->consensus_cache_entry) { + if (published_out) { + consensus_cache_entry_get_valid_after( + spooled->consensus_cache_entry, published_out); + } + return spooled->cce_len; } if (spooled->cached_dir_ref) { |