diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-15 17:41:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-15 17:41:13 -0400 |
| commit | 1f35fd0017240a82ae48475a989819aa81a297dc (patch) | |
| tree | 4d7fb326b4ca734228671b10391b8c7bbb1b643a /src/or/or.h | |
| parent | be231b0db196513036ee624dc5b9b87c4f898625 (diff) | |
| parent | 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 (diff) | |
| download | tor-1f35fd0017240a82ae48475a989819aa81a297dc.tar.gz tor-1f35fd0017240a82ae48475a989819aa81a297dc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
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 0419111a4e..80b552dbb1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3803,6 +3803,8 @@ typedef struct { char *ExtORPortCookieAuthFile; /**< Filesystem location of Extended * ORPort authentication cookie. */ int CookieAuthFileGroupReadable; /**< Boolean: Is the CookieAuthFile g+r? */ + int ExtORPortCookieAuthFileGroupReadable; /**< Boolean: Is the + * ExtORPortCookieAuthFile g+r? */ int LeaveStreamsUnattached; /**< Boolean: Does Tor attach new streams to * circuits itself (0), or does it expect a controller * to cope? (1) */ |