Merge remote-tracking branch 'origin/maint-0.2.2'

Trivial Conflicts in
	src/common/crypto.c
	src/or/main.h
	src/or/or.h

1 files changed, 4 insertions, 2 deletions

diff --git a/src/or/main.h b/src/or/main.h
index 49ed5fea55..ca3f641cef 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -27,10 +27,12 @@ smartlist_t *get_connection_array(void);
 uint64_t get_bytes_read(void);
 uint64_t get_bytes_written(void);
 
+/** Bitmask for events that we can turn on and off with
+ * connection_watch_events. */
 typedef enum watchable_events {
   /* Yes, it is intentional that these match Libevent's EV_READ and EV_WRITE */
-  READ_EVENT=0x02,
-  WRITE_EVENT=0x04
+  READ_EVENT=0x02, /**< We want to know when a connection is readable */
+  WRITE_EVENT=0x04 /**< We want to know when a connection is writable */
 } watchable_events_t;
 void connection_watch_events(connection_t *conn, watchable_events_t events);
 int connection_is_reading(connection_t *conn);