From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Aug 2015 13:50:47 +0000 (-0400)
Subject: Fix an assertion failure introduced in 20254907d7
X-Git-Tag: tor-0.2.7.3-rc~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2691b2bb064466c96c346e6a416658b8b4749a85;p=thirdparty%2Ftor.git

Fix an assertion failure introduced in 20254907d7

Fixes bug 16829; bug not in any released Tor.
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index e70b1b422d..8eeba54374 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -62,7 +62,7 @@ static uint32_t
 dirserv_get_status_impl(const char *fp, const char *nickname,
                         uint32_t addr, uint16_t or_port,
                         const char *platform, const char **msg,
-                        int should_log);
+                        int severity);
 static void clear_cached_dir(cached_dir_t *d);
 static const signed_descriptor_t *get_signed_descriptor_by_fp(
                                                         const char *fp,
@@ -290,7 +290,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg,
 
   return dirserv_get_status_impl(d, router->nickname,
                                  router->addr, router->or_port,
-                                 router->platform, msg, 1);
+                                 router->platform, msg, severity);
 }
 
 /** Return true if there is no point in downloading the router described by