am 7a269cb3: Merge "Store MARK/CONNMARK flags in a central location."

* commit '7a269cb3916692b691c7f3a531f3eba78be7a366':
  Store MARK/CONNMARK flags in a central location.
tree: 2e6faf54c6782b6355feca6b43faab1633c91b43
  1. client/
  2. include/
  3. server/