diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 13:55:02 -0400 |
| commit | 245f273aaf6a6189a57d837d5fd76b76cc9b6f8e (patch) | |
| tree | 2806ce750222a7e80e6151656360aeeb0a6d93eb /src/or/control.c | |
| parent | 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 (diff) | |
| parent | 51e13cd1ad5f7c130521e2a964ea462f35d1880e (diff) | |
| download | tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.tar.gz tor-245f273aaf6a6189a57d837d5fd76b76cc9b6f8e.zip | |
Merge branch 'bug7952_final'
Conflicts:
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/or/control.c')
| -rwxr-xr-x[-rw-r--r--] | src/or/control.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 23e2054f9e..7f421a71d5 100644..100755 --- a/src/or/control.c +++ b/src/or/control.c @@ -2193,6 +2193,9 @@ static const getinfo_item_t getinfo_items[] = { "v3 Networkstatus consensus as retrieved from a DirPort."), ITEM("exit-policy/default", policies, "The default value appended to the configured exit policy."), + ITEM("exit-policy/full", policies, "The entire exit policy of onion router"), + ITEM("exit-policy/ipv4", policies, "IPv4 parts of exit policy"), + ITEM("exit-policy/ipv6", policies, "IPv6 parts of exit policy"), PREFIX("ip-to-country/", geoip, "Perform a GEOIP lookup"), { NULL, NULL, NULL, 0 } }; |