Merge branch 'maint-0.4.1'

This commit is contained in:
Nick Mathewson
2019-06-11 08:41:55 -04:00
3 changed files with 8 additions and 1 deletions
+3
View File
@@ -556,6 +556,9 @@ router_parse_entry_from_string(const char *s, const char *end,
if ((tok = find_opt_by_keyword(tokens, A_PURPOSE))) {
tor_assert(tok->n_args);
router->purpose = router_purpose_from_string(tok->args[0]);
if (router->purpose == ROUTER_PURPOSE_UNKNOWN) {
goto err;
}
} else {
router->purpose = ROUTER_PURPOSE_GENERAL;
}