Merge commit '8dc2a36a' into thread-merge-2.16

diff --cc doc/bird.sgml
Simple merge

diff --cc proto/rpki/config.Y
Simple merge

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

diff --cc proto/rpki/tcp_transport.c
index ebb8030fea2f7e677d7b26d2cce697f187c54b27,87451c94e1637fce288d511501b206950d964fbc..da0a5927bfaffd6c26dd97fd26037efec8ef3ac2
--- 1/proto/rpki/tcp_transport.c
--- 2/proto/rpki/tcp_transport.c
+++ b/proto/rpki/tcp_transport.c
@@@ -28,7 -31,10 +31,10 @@@ rpki_tr_tcp_open(struct rpki_tr_sock *t
  
    sk->type = SK_TCP_ACTIVE;
  
 -  if (sk_open(sk) != 0)
+   if (tcp_cf->auth_type == RPKI_TCP_AUTH_MD5)
+     sk->password = tcp_cf->password;
+ 
 +  if (sk_open(sk, tr->cache->p->p.loop) != 0)
      return RPKI_TR_ERROR;
  
    return RPKI_TR_SUCCESS;