Merge branch 'maint-0.2.4'

Conflicts:
	src/test/test.c

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

diff --cc src/test/test.c
index f89556356a9cead22f552928e886d15e5d7840ff,4ec879234478269a57a31e17d6d0001f96524b5c..21d035647d1a15a77593207174d45e47a5c2034b
--- 1/src/test/test.c
--- 2/src/test/test.c
+++ b/src/test/test.c
@@@ -1539,8 -2047,10 +1585,9 @@@ const struct testcase_setup_t legacy_se
    { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_ ## name }
  
  static struct testcase_t test_array[] = {
 -  ENT(buffers),
 -  { "buffer_copy", test_buffer_copy, 0, NULL, NULL },
    ENT(onion_handshake),
 +  { "bad_onion_handshake", test_bad_onion_handshake, 0, NULL, NULL },
+   ENT(onion_queues),
  #ifdef CURVE25519_ENABLED
    { "ntor_handshake", test_ntor_handshake, 0, NULL, NULL },
  #endif