am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"

* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
  Tweak for forward-compatibility
tree: fcf60e712c8ec063d65d20af892cd7fd3e822c75
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE