+ Eric Dong
Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  C++ compat
  Use guarded memory for the box_easy/box_detached tests.