]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/solaris_warnings_028'
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Sep 2016 20:52:24 +0000 (16:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Sep 2016 20:52:24 +0000 (16:52 -0400)
1  2 
src/common/address.c
src/common/crypto.h
src/common/util.c
src/ext/ed25519/donna/ed25519_tor.c
src/test/test-memwipe.c
src/test/test_channeltls.c
src/test/test_scheduler.c
src/test/test_status.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2e0736f99b07a544e6e9be959eab0f668fd9638f,db331cb662c03459644261d5ac9edff5f8818279..05ea8e86e8f6b189b52a1a236a3e29ba78959cb8
@@@ -1,11 -1,16 +1,10 @@@
  /* Copyright (c) 2014-2016, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
  
- #include <math.h>
  #include "orconfig.h"
  
 -
 -/* Libevent stuff */
 -#ifdef HAVE_EVENT2_EVENT_H
+ #include <math.h>
  #include <event2/event.h>
 -#else
 -#include <event.h>
 -#endif
  
  #define TOR_CHANNEL_INTERNAL_
  #define CHANNEL_PRIVATE_
Simple merge