Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
The source code under this directory is taken from the client for the Tarsnap online backup system (and released under the 2-clause BSD license with permission of the author); keeping this code in sync with the Tarsnap code is highly desirable and explains why there is some functionality included here which is not actually used by the scrypt file encryption utility.