diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 11:09:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 11:09:54 -0400 |
| commit | 77e678c20daf8633ce1904dd1df28398d820f7c0 (patch) | |
| tree | 411cb587ea7533b65edf60c8bc2221b072dda807 /src/or/confparse.c | |
| parent | a01b4d7f87f2217f55f5c5113fe19a2d3081a44c (diff) | |
| parent | 518ebe14dcc7568da353c4c517039d0c621deb28 (diff) | |
| download | tor-77e678c20daf8633ce1904dd1df28398d820f7c0.tar.gz tor-77e678c20daf8633ce1904dd1df28398d820f7c0.zip | |
Merge remote-tracking branch 'github/shrink_or_h_more'
Diffstat (limited to 'src/or/confparse.c')
| -rw-r--r-- | src/or/confparse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/confparse.c b/src/or/confparse.c index b38e06c6a2..60ab32ef82 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -26,6 +26,7 @@ #include "or/routerset.h" #include "lib/container/bitarray.h" +#include "lib/encoding/confline.h" static uint64_t config_parse_memunit(const char *s, int *ok); static int config_parse_msec_interval(const char *s, int *ok); |