diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:31:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:31:40 -0500 |
| commit | 3e3040a5d911e6c4ae59114a0f98daf09ee299bc (patch) | |
| tree | 74ef382fdecab05746d0fb8ccbd81dd0a2c29878 /doc | |
| parent | 7236e42684de017d66b38bac13c4f7ff8dac428c (diff) | |
| parent | 9994404238e6b87907f811cab2a5126d030ff55d (diff) | |
| download | tor-3e3040a5d911e6c4ae59114a0f98daf09ee299bc.tar.gz tor-3e3040a5d911e6c4ae59114a0f98daf09ee299bc.zip | |
Merge branch 'maint-0.2.9'
Conflicts:
src/or/rendservice.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfae1c6323..97eeb9674d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2898,6 +2898,10 @@ __HiddenServiceDirectory__**/client_keys**:: Authorization data for a hidden service that is only accessible by authorized clients. +__HiddenServiceDirectory__**/onion_service_non_anonymous**:: + This file is present if a hidden service key was created in + **HiddenServiceNonAnonymousMode**. + SEE ALSO -------- **torsocks**(1), **torify**(1) + |