Merge branch 'maint-0.2.9'

This commit is contained in:
Nick Mathewson 2016-11-01 13:32:29 -04:00
commit 25f53955f6

View File

@ -1078,7 +1078,7 @@ test_options_validate__transproxy(void *ignored)
tt_int_op(ret, OP_EQ, -1);
tt_assert(!msg);
#endif
#if defined(__FreeBSD_kernel__) || defined( DARWIN )
#if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__)
tdata = get_options_test_data("TransProxyType ipfw\n"
"TransPort 127.0.0.1:123\n");
ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);