Merge commit '9e44ace3' into thread-next-iface

diff --cc doc/bird.sgml
Simple merge

diff --cc proto/bgp/attrs.c
index 039fdff52df21dfa2a25ba8de4f9d4df10016608,204151c37742a726b86d9ea46aed5bc539f76c56..8bff4c78490185b32f7221f84f1f77ec87bf68e3
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2154,8 -1834,8 +2154,8 @@@ bgp_update_attrs(struct bgp_proto *p, s
  
      /* MULTI_EXIT_DESC attribute - accept only if set in export filter */
      a = bgp_find_attr(attrs0, BA_MULTI_EXIT_DISC);
-     if (a && !(a->fresh))
+     if (a && !a->fresh && !p->cf->allow_med)
 -      bgp_unset_attr(&attrs, pool, BA_MULTI_EXIT_DISC);
 +      bgp_unset_attr(&attrs, BA_MULTI_EXIT_DISC);
    }
  
    /* NEXT_HOP attribute - delegated to AF-specific hook */

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

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