diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-04-09 11:50:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-04-09 11:50:20 -0400 |
| commit | 80031db32abebaf4d0a91c01db258fcdbd54a471 (patch) | |
| tree | 19bd6af4959027109db5c83ecb0472ba51ab8404 /src/core/mainloop | |
| parent | 11fbd1f064751e38ccd79e7823adb688b1293e59 (diff) | |
| parent | 75aba30abf50b918ef2188354176bbc2ae59c99c (diff) | |
| download | tor-80031db32abebaf4d0a91c01db258fcdbd54a471.tar.gz tor-80031db32abebaf4d0a91c01db258fcdbd54a471.zip | |
Merge remote-tracking branch 'tor-github/pr/1801/head'
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/cpuworker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index abd48f886c..485ddb9741 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -19,7 +19,6 @@ **/ #include "core/or/or.h" #include "core/or/channel.h" -#include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/connection_or.h" #include "app/config/config.h" @@ -27,6 +26,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "core/or/onion.h" +#include "feature/relay/circuitbuild_relay.h" #include "feature/relay/onion_queue.h" #include "feature/stats/rephist.h" #include "feature/relay/router.h" |