Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3

src/test/test.c

@@ -62,7 +62,6 @@ double fabs(double x);
 #include "routerparse.h"
 #include "statefile.h"
 #include "crypto_curve25519.h"
-#include "onion_ntor.h"
 
 /** Run unit tests for the onion handshake code. */
 static void