From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 May 2018 18:12:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'mikeperry/bug25870_rebase'
X-Git-Tag: tor-0.3.4.1-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5edc72a45b7479f5fe791054aa19f6b3b478c725;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'mikeperry/bug25870_rebase'
---

5edc72a45b7479f5fe791054aa19f6b3b478c725
diff --cc src/test/test_entrynodes.c
index 6af18f8f4f,c97aced042..cfcb88a66e
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@@ -14,9 -15,9 +15,10 @@@
  
  #include "bridges.h"
  #include "circuitlist.h"
+ #include "circuitbuild.h"
  #include "config.h"
  #include "confparse.h"
 +#include "crypto_rand.h"
  #include "directory.h"
  #include "entrynodes.h"
  #include "nodelist.h"