commit bc64a6b2b9c1e0851ce4fc4fe410ac565f3c0137 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 2 11:02:00 2015 -0400

Fix crashes in tests --- src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/config.c b/src/or/config.c index 02b3477..262eeeb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3173,7 +3173,8 @@ options_validate(or_options_t *old_options, or_options_t *options, "http://freehaven.net/anonbib/#hs-attack06 for details."); }

- if (routerset_is_list(options->EntryNodes) && + if (options->EntryNodes && + routerset_is_list(options->EntryNodes) && (routerset_len(options->EntryNodes) == 1) && (options->RendConfigLines != NULL)) { tor_asprintf(msg,