Merge branch 'libscrypt_trunnel_squashed'

Conflicts:
	src/test/test_crypto.c

diff --cc .gitignore
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test_crypto.c
index 86b77a6622557d1f91271db699a4ae0d6872a708,74b7a8eb31914b0805df781479b4156b76e8c02f..36af725e7b614c25a2ce6e891f2877bb26962105
--- 1/src/test/test_crypto.c
--- 2/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@@ -710,7 -699,7 +713,7 @@@ test_crypto_formats(void *arg
  
  /** Run unit tests for our secret-to-key passphrase hashing functionality. */
  static void
- test_crypto_s2k(void *arg)
 -test_crypto_s2k_rfc2440(void)
++test_crypto_s2k_rfc2440(void *arg)
  {
    char buf[29];
    char buf2[29];
@@@ -723,9 -711,9 +726,9 @@@
    buf3 = tor_malloc(65536);
    memset(buf3, 0, 65536);
  
-   secret_to_key(buf+9, 20, "", 0, buf);
+   secret_to_key_rfc2440(buf+9, 20, "", 0, buf);
    crypto_digest(buf2+9, buf3, 1024);
 -  test_memeq(buf, buf2, 29);
 +  tt_mem_op(buf,==, buf2, 29);
  
    memcpy(buf,"vrbacrda",8);
    memcpy(buf2,"vrbacrda",8);