[tor-commits] [tor/master] Merge branch 'maint-0.2.4'

[arma@xxxxxxxxxxxxxx]

commit 6156887adfa724805f90b3b7cf2be6213f08a450
Merge: d5e9573 c6f1668
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Wed Sep 4 23:44:39 2013 -0400

    Merge branch 'maint-0.2.4'
    
    Conflicts:
    	src/test/test.c

 changes/feature9574 |    7 ++
 src/or/onion.c      |  231 +++++++++++++++++++++++++++++++++++++++++----------
 src/or/onion.h      |    4 +
 src/test/test.c     |   47 +++++++++++
 4 files changed, 244 insertions(+), 45 deletions(-)

diff --cc src/test/test.c
index f895563,4ec8792..21d0356
--- 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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits