diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-10-12 11:39:37 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-10-12 11:39:37 -0400 |
commit | 67351f672450d5f13754294405243a59ddd86de9 (patch) | |
tree | 016368ae0c3b6e56c0dc03c185fe5a095d72f22e /src/feature/hs | |
parent | 391756f262c93d4361fb6189a3ba9704283f73aa (diff) | |
parent | a1504f138d978d73b2c6129957dd0ee344a97efa (diff) | |
download | tor-67351f672450d5f13754294405243a59ddd86de9.tar.gz tor-67351f672450d5f13754294405243a59ddd86de9.zip |
Merge remote-tracking branch 'tor-github/pr/380'
Diffstat (limited to 'src/feature/hs')
-rw-r--r-- | src/feature/hs/hs_descriptor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index b9a0c0ef1f..8515314b38 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -61,7 +61,7 @@ #include "core/or/circuitbuild.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "feature/nodelist/parsecommon.h" +#include "feature/dirparse/parsecommon.h" #include "feature/rend/rendcache.h" #include "feature/hs/hs_cache.h" #include "feature/hs/hs_config.h" |