[or-cvs] [tor/master] fix compile

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 21 Dec 2009 03:48:40 -0500
Subject: fix compile
Commit: 22e07b4ead93914708b4579aa1241f7f4f4121a2

---
 src/or/connection_edge.c |    2 ++
 src/or/or.h              |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 47230da..d7e8394 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2848,6 +2848,8 @@ int
 connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit,
                            int excluded_means_no)
 {
+  or_options_t *options = get_options();
+
   tor_assert(conn);
   tor_assert(conn->_base.type == CONN_TYPE_AP);
   tor_assert(conn->socks_request);
diff --git a/src/or/or.h b/src/or/or.h
index 431b62e..eca3b6f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2341,7 +2341,7 @@ typedef struct {
   struct routerset_t *_ExcludeExitNodesUnion;
 
   int DisableAllSwap; /**< Boolean: Attempt to call mlockall() on our
-                               * process for all current and future memory. */
+                       * process for all current and future memory. */
 
   /** List of "entry", "middle", "exit", "introduction", "rendezvous". */
   smartlist_t *AllowInvalidNodes;
-- 
1.5.6.5