tree f8d049c35e5775f87f4b697710b99f013477c78d
parent 210d5ff6edd8125594095f0f0a4b86f129e0d547
parent 8e5717cd1bb7897b8462e56e7abeeec0f7bf9ffb
author Thai Duong <thaidn@gmail.com> 1594715783 -0700
committer Thai Duong <thaidn@gmail.com> 1594715783 -0700

Merge branch '1.4' of github.com:google/tink into 1.4