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

[nickm at torproject.org]

commit acd6a4856bccff92eb241b18066ca7df577ab5f2
Merge: e36f9d1 0b3166f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 13:36:40 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/connection.c

 changes/dirvote_null_deref |    4 ++++
 changes/mdesc_null_deref   |    5 +++++
 src/or/circuitbuild.c      |   12 +++++++++++-
 src/or/connection.c        |    2 +-
 src/or/connection_or.c     |    3 +--
 src/or/control.c           |    5 ++++-
 src/or/dirvote.c           |    6 +++---
 src/or/microdesc.c         |    2 +-
 src/or/or.h                |    4 +++-
 9 files changed, 33 insertions(+), 10 deletions(-)

diff --cc src/or/connection.c
index 02ae7ee,fc2097f..e7f2b00
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@@ -1283,8 -1240,8 +1283,8 @@@ connection_connect(connection_t *conn, 
  {
    int s, inprogress = 0;
    char addrbuf[256];
-   struct sockaddr *dest_addr = (struct sockaddr*) addrbuf;
+   struct sockaddr *dest_addr;
 -  socklen_t dest_addr_len;
 +  int dest_addr_len;
    or_options_t *options = get_options();
    int protocol_family;