summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-12-21 03:48:40 -0500
committerRoger Dingledine <arma@torproject.org>2009-12-21 03:52:34 -0500
commit22e07b4ead93914708b4579aa1241f7f4f4121a2 (patch)
tree0993a64b928a0d48c5f5736abe2b297834b231bf
parent2138b05f17a755ca154a0e0aae28e5c9b7c9ac35 (diff)
downloadtor-22e07b4ead93914708b4579aa1241f7f4f4121a2.tar.gz
tor-22e07b4ead93914708b4579aa1241f7f4f4121a2.zip
fix compile
-rw-r--r--src/or/connection_edge.c2
-rw-r--r--src/or/or.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 47230da2e0..d7e8394614 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 431b62e8de..eca3b6f0ce 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;