From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 2 Dec 2018 01:32:18 +0000 (-0500)
Subject: Merge branch 'ticket27490a_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b2b97484ad07c91ac410735a96fe8710e60cf23;p=thirdparty%2Ftor.git

Merge branch 'ticket27490a_squashed'
---

2b2b97484ad07c91ac410735a96fe8710e60cf23
diff --cc src/core/or/policies.c
index 0eda93c5f3,c630c2fbdc..123fc8566e
--- a/src/core/or/policies.c
+++ b/src/core/or/policies.c
@@@ -25,10 -23,12 +25,11 @@@
  #include "feature/nodelist/microdesc.h"
  #include "feature/nodelist/networkstatus.h"
  #include "feature/nodelist/nodelist.h"
 -#include "core/or/policies.h"
  #include "feature/relay/router.h"
 -#include "feature/nodelist/routerparse.h"
 -#include "feature/stats/geoip.h"
 +#include "feature/relay/routermode.h"
 +#include "lib/geoip/geoip.h"
  #include "ht.h"
+ #include "lib/crypt_ops/crypto_rand.h"
  #include "lib/encoding/confline.h"
  
  #include "core/or/addr_policy_st.h"