diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index f1571d5d30..521302a376 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1973,9 +1973,6 @@ control_event_guard_deferred(void)
 #endif
 }
 
-/* DOCDOC */
-#define NUM_ENTRY_PICK_TRIES 100
-
 /** Add a new (preferably stable and fast) router to our
  * entry_guards list. Return a pointer to the router if we succeed,
  * or NULL if we can't find any more suitable entries.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index d171914860..6f5239925c 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -14,11 +14,6 @@ const char connection_or_c_id[] =
 
 #include "or.h"
 
-/** How much clock skew do we tolerate when checking certificates for
- * known routers? (sec) */
-
-#define TIGHT_CERT_ALLOW_SKEW (90*60)
-
 static int connection_tls_finish_handshake(or_connection_t *conn);
 static int connection_or_process_cells_from_inbuf(or_connection_t *conn);
 static int connection_or_empty_enough_for_dirserv_data(or_connection_t *conn);
diff --git a/src/or/control.c b/src/or/control.c
index a374944ec3..2aef65f1f5 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -59,7 +59,7 @@ const char control_c_id[] =
 #define ERR_UNRECOGNIZED_EVENT_CODE 0x0006
 #define ERR_UNAUTHORIZED            0x0007
 #define ERR_REJECTED_AUTHENTICATION 0x0008
-#define ERR_RESOURCE_EXHAUSETED     0x0009
+#define ERR_RESOURCE_EXHAUSTED      0x0009
 #define ERR_NO_STREAM               0x000A
 #define ERR_NO_CIRC                 0x000B
 #define ERR_NO_ROUTER               0x000C