trying some more gcrypt vs. gnutls vs. curl threading fixes
related build fixups
again
*sigh* ... again
Revert "trying some more gcrypt vs. gnutls vs. curl threading fixes"

This reverts commit 3765ec86498b503b6d4ec7b72e070eb5f5fc3d1f.

(they were squeeze specific)