diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 15:23:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-07 15:23:14 -0500 |
| commit | b65889359035280282904a9f164671552c8aa9b7 (patch) | |
| tree | 874002450ea70cbc8970132fcd85353bf669b5d8 /src/or/config.c | |
| parent | ab013719e5f00e44c45d2bbc3bc54c8833321d82 (diff) | |
| parent | 53d4e89626856eabe235c50ffc3d6a697f176741 (diff) | |
| download | tor-b65889359035280282904a9f164671552c8aa9b7.tar.gz tor-b65889359035280282904a9f164671552c8aa9b7.zip | |
Merge branch 'bug19960_2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 972e3be09e..81be2a4b3a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3053,7 +3053,7 @@ options_validate(or_options_t *old_options, or_options_t *options, } else if (!strcasecmp(options->TransProxyType, "ipfw")) { #ifndef KERNEL_MAY_SUPPORT_IPFW /* Earlier versions of OS X have ipfw */ - REJECT("ipfw is a FreeBSD-specific" + REJECT("ipfw is a FreeBSD-specific " "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_IPFW; |