Merge commit '460321cfe979459e3b78ba87694f29865d321612' into thread-next

diff --cc lib/printf_test.c
Simple merge

diff --cc proto/bmp/bmp.c
index d880545ad0b32f8f623dc2177ddfbf441c0754b9,599024f550c2480d263c1b44ede3b5e437796ab2..011b276e781164312141d5a5f80c2aaa59b964a3
--- 1/proto/bmp/bmp.c
--- 2/proto/bmp/bmp.c
+++ b/proto/bmp/bmp.c
@@@ -1392,10 -1243,9 +1392,9 @@@ bmp_start(struct proto *P
  {
    struct bmp_proto *p = (void *) P;
  
 -  p->buffer_mpool = rp_new(P->pool, "BMP Buffer");
 -  p->tx_mem_pool = rp_new(P->pool, "BMP Tx");
 -  p->update_msg_mem_pool = rp_new(P->pool, "BMP Update");
 +  p->buffer_mpool = rp_new(P->pool, proto_domain(&p->p), "BMP Buffer");
-   p->map_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Map");
 +  p->tx_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Tx");
 +  p->update_msg_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Update");
    p->tx_ev = ev_new_init(p->p.pool, bmp_fire_tx, p);
    p->update_ev = ev_new_init(p->p.pool, bmp_route_monitor_commit, p);
    p->connect_retry_timer = tm_new_init(p->p.pool, bmp_connection_retry, p, 0, 0);

diff --cc proto/bmp/bmp.h
Simple merge