Merge branch 'maint-0.3.4'

diff --cc src/lib/time/compat_time.c
Simple merge

diff --cc src/lib/time/compat_time.h
Simple merge

diff --cc src/test/test_circuitmux.c
index 1d46f8de0d5c26f80dacaebd87dc71fbb3e628ed,c81d53ae51e95400d21adc2769a657baee81d420..1be2ff5281336ddc7b730f8d2ca188e5515c8849
--- 1/src/test/test_circuitmux.c
--- 2/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)