From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 20 Sep 2018 14:43:08 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.2-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f377e910f89753f6e64a4f9ddc2ff9c35d1e341;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

1f377e910f89753f6e64a4f9ddc2ff9c35d1e341
diff --cc src/test/test_circuitmux.c
index 1d46f8de0d,c81d53ae51..1be2ff5281
--- a/src/test/test_circuitmux.c
+++ b/src/test/test_circuitmux.c
@@@ -5,16 -5,16 +5,18 @@@
  #define CIRCUITMUX_PRIVATE
  #define CIRCUITMUX_EWMA_PRIVATE
  #define RELAY_PRIVATE
 -#include "or.h"
 -#include "channel.h"
 -#include "circuitmux.h"
 -#include "circuitmux_ewma.h"
 -#include "relay.h"
 -#include "scheduler.h"
 -#include "test.h"
 +#include "core/or/or.h"
 +#include "core/or/channel.h"
 +#include "core/or/circuitmux.h"
 +#include "core/or/circuitmux_ewma.h"
 +#include "core/or/relay.h"
 +#include "core/or/scheduler.h"
 +#include "test/test.h"
 +
 +#include "core/or/destroy_cell_queue_st.h"
  
+ #include <math.h>
+ 
  /* XXXX duplicated function from test_circuitlist.c */
  static channel_t *
  new_fake_channel(void)