From: Roger Dingledine <arma@torproject.org>
Date: Thu, 5 Sep 2013 03:44:39 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6156887adfa724805f90b3b7cf2be6213f08a450;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'

Conflicts:
	src/test/test.c
---

6156887adfa724805f90b3b7cf2be6213f08a450
diff --cc src/test/test.c
index f89556356a,4ec8792344..21d035647d
--- a/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