Merge branch 'change-server-keeps-old' into next

* change-server-keeps-old:
  * Update for new bdlib String

Conflicts:
	src/misc.c

src/misc.c

@@ -800,7 +800,7 @@ restart(int idx)
     if (my_cookie_counter)
       stream << bd::String::printf(STR("+my_cookie_counter %lu\n"), my_cookie_counter);
     stream << bd::String::printf(STR("+server_online %li\n"), server_online);
-    stream << buf.printf(STR("+cursrvname %s\n"), cursrvname);
+    stream << bd::String::printf(STR("+cursrvname %s\n"), cursrvname);
   }
   stream << bd::String::printf(STR("+online_since %li\n"), online_since);
   if (floodless)