From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 26 Mar 2012 22:51:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.13-alpha~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/control.c
---

5a2d0fbe64eda754a87ec35cfbd5d49c91ebc4b2
diff --cc src/or/control.c
index 9a07777a72,ddfc80e8fd..1eb6b80b80
--- 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)