Merge branch 'master' into backport

diff --cc doc/bird.sgml
Simple merge

diff --cc proto/bgp/attrs.c
index 2f6cf640446b6f88732200ae776212136bde3d0e,0d2116b7859150abf8e0bfc157e4665391a35154..a56aeb19774d9a7959ea185cc4a78e29c2385b02
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -1676,11 -1711,13 +1718,12 @@@ bgp_free_prefix(struct bgp_channel *c, 
   */
  
  int
 -bgp_preexport(struct channel *C, rte **new, struct linpool *pool UNUSED)
 +bgp_preexport(struct channel *C, rte *e)
  {
 -  rte *e = *new;
 -  struct proto *SRC = e->attrs->src->proto;
 -  struct bgp_channel *c = (struct bgp_channel *) C;
 +  struct proto *SRC = e->src->proto;
    struct bgp_proto *p = (struct bgp_proto *) C->proto;
    struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
++  struct bgp_channel *c = (struct bgp_channel *) C;
  
    /* Reject our routes */
    if (src == p)

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

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

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