am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev
dxie@google.com authored
* commit 'ba1b44d5':
  Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
9073d215