diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-11 10:02:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-11 10:02:24 -0400 |
| commit | 60832766ac19e8f027455d23254e376042c21ef2 (patch) | |
| tree | d0ad897e5315d6689c1393dd4c06b5176734daaa | |
| parent | 3799ce7970a5d1fe21ce2921c763f06e4369cfee (diff) | |
| download | tor-60832766ac19e8f027455d23254e376042c21ef2.tar.gz tor-60832766ac19e8f027455d23254e376042c21ef2.zip | |
Look at the right consensus in router_add_to_routerlist()
Just looking at the "latest" consensus could give us a microdesc
consensus, if microdescs were enabled. That would make us decide
that every routerdesc was unlisted in the latest consensus and drop
them all: Ouch.
Fixes bug 3113; bugfix on 0.2.3.1-alpha.
| -rw-r--r-- | changes/bug3113 | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug3113 b/changes/bug3113 new file mode 100644 index 0000000000..7c3b5ce379 --- /dev/null +++ b/changes/bug3113 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Do not free all general-purposes regular descriptors just + because microdescriptor use is enabled. Fixes bug 3113; + bugfix on 0.2.3.1-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 00557a26e9..5aaa4a9614 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3273,7 +3273,8 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, int authdir = authdir_mode_handles_descs(options, router->purpose); int authdir_believes_valid = 0; routerinfo_t *old_router; - networkstatus_t *consensus = networkstatus_get_latest_consensus(); + networkstatus_t *consensus = + networkstatus_get_latest_consensus_by_flavor(FLAV_NS); const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list(); int in_consensus = 0; |