diff --git a/src/or/rephist.c b/src/or/rephist.c
index 2bb19d557c..5b38fa60c5 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -586,7 +586,7 @@ rep_hist_bandwidth_assess(void)
  *
  * It returns the number of bytes written.
  */
-size_t
+static size_t
 rep_hist_fill_bandwidth_history(char *buf, size_t len, bw_array_t *b)
 {
   char *cp = buf;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 817c95e1fe..f78b747637 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3443,11 +3443,11 @@ update_router_descriptor_cache_downloads(time_t now)
     networkstatus_t *ns = smartlist_get(networkstatus_list, i);
     trusted_dir_server_t *ds =
       router_get_trusteddirserver_by_digest(ns->identity_digest);
+    smartlist_t *dl = download_from[i];
     if (!ds) {
       warn(LD_BUG, "Networkstatus with no corresponding authority!");
       continue;
     }
-    smartlist_t *dl = download_from[i];
     if (! smartlist_len(dl))
       continue;
     info(LD_DIR, "Requesting %d descriptors from authority \"%s\"",