diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-24 22:59:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-24 22:59:37 -0500 |
| commit | f634228a073965195c4088b66c1d5c4799c6eed2 (patch) | |
| tree | 3113bac14b861247cc900851104ef8c246292477 /src/or/config.c | |
| parent | 11221d0f17bf3ea6039249ad8b06b3a1afd6291d (diff) | |
| parent | 6e6a6612966d7ea9ad3d89bb5073ef400539b2a7 (diff) | |
| download | tor-f634228a073965195c4088b66c1d5c4799c6eed2.tar.gz tor-f634228a073965195c4088b66c1d5c4799c6eed2.zip | |
Merge remote-tracking branch 'public/feature4516'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 06d7d5c022..ef9e4ecee4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -405,6 +405,7 @@ static config_var_t _option_vars[] = { V(UseEntryGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "auto"), V(User, STRING, NULL), + V(UserspaceIOCPBuffers, BOOL, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"), VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir, "0"), |