[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 57b954293e3880f3b39d2f0f0f7710250e8ffc5f
Merge: 415caba 6617822
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 16 17:09:32 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Trivial Conflicts in
    	src/common/crypto.c
    	src/or/main.h
    	src/or/or.h

 Doxyfile.in                  |  295 ++++++++++++++++++++++++++++++++---------
 src/common/address.c         |    7 +-
 src/common/address.h         |   25 +++-
 src/common/aes.c             |    3 +
 src/common/compat.c          |   29 ++++-
 src/common/compat.h          |   24 +++-
 src/common/compat_libevent.c |   12 ++-
 src/common/container.c       |   19 +++-
 src/common/container.h       |    6 +-
 src/common/crypto.c          |   62 +++++++---
 src/common/log.c             |   26 +++-
 src/common/memarea.c         |    9 ++
 src/common/torgzip.c         |   10 +-
 src/common/torint.h          |    2 +-
 src/common/torlog.h          |    3 +-
 src/or/circuitbuild.c        |    4 +-
 src/or/connection_or.c       |    2 +-
 src/or/main.h                |    6 +-
 src/or/ntmain.c              |   10 ++
 src/or/or.h                  |   30 ++++-
 src/or/routerparse.h         |    2 +-
 21 files changed, 465 insertions(+), 121 deletions(-)

diff --cc src/common/crypto.c
index 587a83a,ed434a3..fd0a494
--- a/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/or/main.h
index 49ed5fe,ed0fb97..ca3f641
--- a/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 {
 +  /* 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);
diff --cc src/or/or.h
index 553afbd,e3e01cf..6d06b85
--- a/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. */