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

[nickm at torproject.org]

commit d50f90bfc4457b499d5bf56b674289f70f1004bd
Merge: 2ae92ab97 6e0872e86
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 23 19:37:32 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c
index 745aa987a,aea3ad659..f96a0b33e
--- a/src/test/test.c
+++ b/src/test/test.c
@@@ -34,42 -33,28 +36,34 @@@
  #define MAIN_PRIVATE
  #define STATEFILE_PRIVATE
  
- /*
-  * Linux doesn't provide lround in math.h by default, but mac os does...
-  * It's best just to leave math.h out of the picture entirely.
-  */
- //#include <math.h>
- long int lround(double x);
- double fabs(double x);
- 
 -#include "or.h"
 -#include "backtrace.h"
 -#include "buffers.h"
 -#include "circuitlist.h"
 -#include "circuitstats.h"
 -#include "compress.h"
 -#include "config.h"
 -#include "connection_edge.h"
 -#include "rendcommon.h"
 -#include "rendcache.h"
 -#include "test.h"
 -#include "main.h"
 -#include "memarea.h"
 -#include "onion.h"
 -#include "onion_ntor.h"
 -#include "onion_fast.h"
 -#include "onion_tap.h"
 -#include "policies.h"
 -#include "rephist.h"
 -#include "routerparse.h"
 -#include "statefile.h"
 -#include "crypto_curve25519.h"
 +#include "core/or/or.h"
 +#include "lib/err/backtrace.h"
 +#include "lib/container/buffers.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuitstats.h"
 +#include "lib/compress/compress.h"
 +#include "app/config/config.h"
 +#include "core/or/connection_edge.h"
 +#include "feature/rend/rendcommon.h"
 +#include "feature/rend/rendcache.h"
 +#include "test/test.h"
 +#include "core/mainloop/main.h"
 +#include "lib/memarea/memarea.h"
 +#include "core/crypto/onion.h"
 +#include "core/crypto/onion_ntor.h"
 +#include "core/crypto/onion_fast.h"
 +#include "core/crypto/onion_tap.h"
 +#include "core/or/policies.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/nodelist/routerparse.h"
 +#include "app/config/statefile.h"
 +#include "lib/crypt_ops/crypto_curve25519.h"
 +
 +#include "core/or/extend_info_st.h"
 +#include "core/or/or_circuit_st.h"
 +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
 +#include "feature/rend/rend_intro_point_st.h"
 +#include "feature/rend/rend_service_descriptor_st.h"
  
  /** Run unit tests for the onion handshake code. */
  static void