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

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

diff --cc src/common/address.c
Simple merge

diff --cc src/common/address.h
Simple merge

diff --cc src/common/aes.c
Simple merge

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/compat_libevent.c
Simple merge

diff --cc src/common/container.c
Simple merge

diff --cc src/common/crypto.c
index 587a83ad8a07f24b642a54d16544aed91bb8ad2a,ed434a312e741b19c9a1947603d2bd43152ff225..fd0a494e7645690afd058a53dfb4fc4b1cf29852
--- 1/src/common/crypto.c
--- 2/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -2684,3 -2709,4 +2709,6 @@@ setup_openssl_threading(void
    return 0;
  }
  #endif
+ /** @} */
++
++

diff --cc src/common/log.c
Simple merge

diff --cc src/common/memarea.c
Simple merge

diff --cc src/common/torlog.h
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/or/main.h
index 49ed5fea5562e6a4f3cff23b8ed8043b923a7fb1,ed0fb97703449ca08a517296a4cd6aa43eb433d0..ca3f641cef58083752d319b2bc29934e7a689551
--- 1/src/or/main.h
--- 2/src/or/main.h
+++ b/src/or/main.h
@@@ -24,13 -22,12 +24,15 @@@ void add_connection_to_closeable_list(c
  int connection_is_on_closeable_list(connection_t *conn);
  
  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 {
-   READ_EVENT=0x02,
-   WRITE_EVENT=0x04
 +  /* Yes, it is intentional that these match Libevent's EV_READ and EV_WRITE */
+   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);

diff --cc src/or/ntmain.c
Simple merge

diff --cc src/or/or.h
index 553afbdb7b2c29aaff8dea9668b802e39f5a62db,e3e01cff55787e7d0cb6243e5eec9dd516ff452d..6d06b85e987a9f2528a805edeb4f0a373a3d4784
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -860,10 -848,14 +860,14 @@@ typedef struct cell_t 
  
  /** Parsed variable-length onion routing cell. */
  typedef struct var_cell_t {
+   /** Type of the cell: CELL_VERSIONS, etc. */
    uint8_t command;
+   /** Circuit thich received the cell */
    circid_t circ_id;
-   uint16_t payload_len; /**< The actual length of <b>payload</b>. */
+   /** Number of bytes actually stored in <b>payload</b> */
+   uint16_t payload_len;
+   /** Payload of this cell */
 -  uint8_t payload[1];
 +  uint8_t payload[FLEXIBLE_ARRAY_MEMBER];
  } var_cell_t;
  
  /** A cell as packed for writing to the network. */