diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-24 23:38:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-24 23:38:32 -0500 |
| commit | 68114ca52cbed0b7970a60717be4ca22ffdc5d00 (patch) | |
| tree | 23d882336da9b8736ea432843e383aef654019f8 /src/or/or.h | |
| parent | f634228a073965195c4088b66c1d5c4799c6eed2 (diff) | |
| parent | f79a75f59731eab85c019c41827c0c0e89d90498 (diff) | |
| download | tor-68114ca52cbed0b7970a60717be4ca22ffdc5d00.tar.gz tor-68114ca52cbed0b7970a60717be4ca22ffdc5d00.zip | |
Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index f186eac7bd..546fe17bf3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3248,6 +3248,8 @@ typedef struct { disclaimer. This allows a server administrator to show that they're running Tor and anyone visiting their server will know this without any specialized knowledge. */ + int DisableDebuggerAttachment; /**< Currently Linux only specific attempt to + disable ptrace; needs BSD testing. */ /** Boolean: if set, we start even if our resolv.conf file is missing * or broken. */ int ServerDNSAllowBrokenConfig; |