Merge remote-tracking branch 'tor-github/pr/298'

diff --cc src/core/or/circuitbuild.c
Simple merge

diff --cc src/core/or/relay.c
Simple merge

diff --cc src/test/test_relaycell.c
index a6c152f738e3b317c8d1df9e84f2180c341e4f33,63820c996884977756d4f26c9740a3c8279f968b..eddba6591553739e3afea0b439d7cfbcc8aac751
--- 1/src/test/test_relaycell.c
--- 2/src/test/test_relaycell.c
+++ b/src/test/test_relaycell.c
@@@ -9,7 -9,8 +9,8 @@@
  #include "core/mainloop/main.h"
  #include "app/config/config.h"
  #include "core/mainloop/connection.h"
 -#include "lib/crypt_ops/crypto.h"
 +#include "lib/crypt_ops/crypto_cipher.h"
+ #include "lib/crypt_ops/crypto_rand.h"
  #include "core/or/circuitbuild.h"
  #include "core/or/circuitlist.h"
  #include "core/or/connection_edge.h"
@@@ -511,6 -1075,8 +1075,7 @@@ test_relaycell_resolved(void *arg
  struct testcase_t relaycell_tests[] = {
    { "resolved", test_relaycell_resolved, TT_FORK, NULL, NULL },
    { "circbw", test_circbw_relay, TT_FORK, NULL, NULL },
+   { "halfstream", test_halfstream_insertremove, TT_FORK, NULL, NULL },
+   { "streamwrap", test_halfstream_wrap, TT_FORK, NULL, NULL },
    END_OF_TESTCASES
  };
--