Fix crash with "tor --list-fingerprint" (reported by seeess).

svn:r9328

2 files changed, 7 insertions, 6 deletions

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 76c3ce8f3a..32125402d1 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -585,7 +585,7 @@ circuit_get_by_edge_conn(edge_connection_t *conn)
   return circ;
 }
 
-/** For each circuits that have <b>conn</b> as n_conn or p_conn, unlink the
+/** For each circuit that has <b>conn</b> as n_conn or p_conn, unlink the
  * circuit from the orconn,circid map, and mark it for close if it hasn't
  * been marked already.
  */
diff --git a/src/or/config.c b/src/or/config.c
index 0ad8dac899..2378aa2946 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -904,16 +904,16 @@ options_act(or_options_t *old_options)
     tor_free(fn);
   }
 
-  /* Bail out at this point if we're not going to be a client or server:
-   * we want to not fork, and to log stuff to stderr. */
-  if (options->command != CMD_RUN_TOR)
-    return 0;
-
   /* Load state */
   if (! global_state)
     if (or_state_load())
       return -1;
 
+  /* Bail out at this point if we're not going to be a client or server:
+   * we want to not fork, and to log stuff to stderr. */
+  if (options->command != CMD_RUN_TOR)
+    return 0;
+
   {
     smartlist_t *sl = smartlist_create();
     char *errmsg = NULL;
@@ -3881,6 +3881,7 @@ decode_libevent_version(void)
 or_state_t *
 get_or_state(void)
 {
+  tor_assert(global_state);
   return global_state;
 }