diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-05 08:19:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-05 08:19:02 -0500 |
| commit | ca4b86f90a73532032a573ebc903155a32d0f36b (patch) | |
| tree | 54d10b6031452388d2540a6db93bbbc83c164ca8 /src/feature | |
| parent | c01507a5fe73d0e49902a8abaa1f73112ae1fefa (diff) | |
| parent | eaff47352a1ef607f6d97e9b35bd6d5eefdfcb26 (diff) | |
| download | tor-ca4b86f90a73532032a573ebc903155a32d0f36b.tar.gz tor-ca4b86f90a73532032a573ebc903155a32d0f36b.zip | |
Merge remote-tracking branch 'tor-github/pr/508'
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/control/control.c | 2 | ||||
| -rw-r--r-- | src/feature/stats/geoip_stats.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 94679dfd22..26d2e54fed 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -87,7 +87,7 @@ #include "feature/rend/rendservice.h" #include "feature/stats/geoip_stats.h" #include "feature/stats/predict_ports.h" -#include "lib/container/buffers.h" +#include "lib/buf/buffers.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "lib/encoding/confline.h" diff --git a/src/feature/stats/geoip_stats.c b/src/feature/stats/geoip_stats.c index 1a4f8ddfb0..3106c6c82c 100644 --- a/src/feature/stats/geoip_stats.c +++ b/src/feature/stats/geoip_stats.c @@ -30,7 +30,7 @@ #include "core/or/or.h" #include "ht.h" -#include "lib/container/buffers.h" +#include "lib/buf/buffers.h" #include "app/config/config.h" #include "feature/control/control.h" #include "feature/client/dnsserv.h" |