Merge branch 'maint-0.3.0' into release-0.3.0

src/or/networkstatus.c

@@ -2444,6 +2444,7 @@ int
 client_would_use_router(const routerstatus_t *rs, time_t now,
                         const or_options_t *options)
 {
+  (void) options; /* unused */
   if (!rs->is_flagged_running) {
     /* If we had this router descriptor, we wouldn't even bother using it.
      * (Fetching and storing depends on by we_want_to_fetch_flavor().) */