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

Conflicts:
	src/or/connection.c

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

diff --cc src/or/connection.c
index 02ae7ee7a07bd9b5124ddeac12b517c6d81b7c2a,fc2097f9a926d8301d0ccea7ec24644ef3e42a4a..e7f2b0051db3f0fe00e3fe18c4ca900d467541fd
--- 1/src/or/connection.c
--- 2/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;
  

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

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

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

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

diff --cc src/or/or.h
Simple merge