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

Conflicts:
	src/or/control.c

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

diff --cc src/or/control.c
index 9a07777a72e42190cc0031b38878aab18643aac0,ddfc80e8fd7a3a02941496e9a9f891b0cd1b7c93..1eb6b80b802a29ca4bfc211f82d16fb874089427
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c
@@@ -2903,9 -2789,11 +2935,11 @@@ handle_control_protocolinfo(control_con
      {
        int passwd = (options->HashedControlPassword != NULL ||
                      options->HashedControlSessionPassword != NULL);
 -      smartlist_t *mlist = smartlist_create();
 +      smartlist_t *mlist = smartlist_new();
-       if (cookies)
+       if (cookies) {
          smartlist_add(mlist, (char*)"COOKIE");
+         smartlist_add(mlist, (char*)"SAFECOOKIE");
+       }
        if (passwd)
          smartlist_add(mlist, (char*)"HASHEDPASSWORD");
        if (!cookies && !passwd)

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