merge -r 3156:3183 branches/leaks -> trunk should be a great big no-op unless you pass extra configure flags, or have openssl configured with engines turned on.
Changed paths: