Merge branch 'mq-aggregator-for-v3' into thread-next

diff --cc proto/aggregator/aggregator.c
index 5df9ad4055eb9cfda0b73286b91d2b85cbfdbbe4,b7b565178e6bfbd23523fc24d5abe149f02525d0..c13b93adb93c20d051b93d1d097c7a8bd7d1fcd7
--- 1/proto/aggregator/aggregator.c
--- 2/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@@ -74,7 -74,8 +74,8 @@@ aggregator_bucket_update(struct aggrega
    /* Empty bucket */
    if (!bucket->rte)
    {
 -    rte_update2(p->dst, net->n.addr, NULL, bucket->last_src);
 +    rte_update(p->dst, net, NULL, bucket->last_src);
+     rt_unlock_source(bucket->last_src);
      bucket->last_src = NULL;
      return;
    }