Merge commit '9784c76c9' into thread-next

diff --cc .gitlab-ci.yml
index bae6ebab681d12a0d7401cba22691c36fe57e5ca,0b402e6ec7299e7e1b70fb7e8dea19a94b831394..eb3bf27f064ef0953a26bd2785bbb4b493e73a16
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -735,8 -726,18 +735,18 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
  
+ test-babel-base:
+   <<: *test-base
+   variables:
+     TEST_NAME: cf-babel-base
+ 
+ test-babel-auth:
+   <<: *test-base
+   variables:
+     TEST_NAME: cf-babel-auth
+ 
  test-ospf-base:
    <<: *test-base
    variables:

diff --cc proto/bgp/bgp.c
Simple merge