Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'
authorClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 16:17:02 +0000 (18:17 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 16:20:10 +0000 (18:20 +0200)
commitedc43c571d66b07315f99d00b5ada667fc77b932
tree2468785503c607657ebf87a759d629917332c49c
parent68e3c9a3b680ffdc5ea4961090d8d7ec3efbdb1f
parent0a4b9d0ccd10b3c39105f99bd320f696f69a75a2
Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'

* commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2':
  hlsenc: Add encryption support

This commit is a noop, see 907ac20aa29341e49a4f89ff3d4240d92f9a0cb9

Note that this commit differs from our encryption support in various
ways so it may need some adjustments in the future.

Merged-by: Clément Bœsch <u@pkh.me>