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

[nickm at torproject.org]

commit 5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2
Merge: f5c59eb 9740f06
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 18:51:37 2012 -0400

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

 changes/safecookie  |    9 +++
 src/or/connection.c |    1 +
 src/or/control.c    |  159 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/or/or.h         |    6 ++
 4 files changed, 173 insertions(+), 2 deletions(-)

diff --cc src/or/control.c
index 9a07777,ddfc80e..1eb6b80
--- a/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)