From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 May 2018 18:25:07 +0000 (-0400)
Subject: Merge branch 'bug25903_v5_squashed'
X-Git-Tag: tor-0.3.4.1-alpha~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a394a2dd86579495797432114f62ea3265ed5ed0;p=thirdparty%2Ftor.git

Merge branch 'bug25903_v5_squashed'
---

a394a2dd86579495797432114f62ea3265ed5ed0
diff --cc src/or/rendcommon.c
index 3a7dfe28f8,2a77b2ece7..f3fa2f64d1
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@@ -12,14 -12,10 +12,15 @@@
  
  #include "or.h"
  #include "circuitbuild.h"
+ #include "circuituse.h"
  #include "config.h"
  #include "control.h"
 +#include "crypto_rand.h"
 +#include "crypto_util.h"
 +#include "hs_client.h"
  #include "hs_common.h"
 +#include "hs_intropoint.h"
 +#include "networkstatus.h"
  #include "rendclient.h"
  #include "rendcommon.h"
  #include "rendmid.h"