diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-13 10:48:07 -0400 |
| commit | 600744b4be3d83a3e4924c8712bc30b7de1f4d3c (patch) | |
| tree | 9060cc5d17499fc87b93c8d14492df8cae1a9e59 /src/or/or.h | |
| parent | 87c79cf01760787bcd9e8616b17babe5a7e4eca4 (diff) | |
| parent | 5f2a1a7b4f20be121cd30def95cf7789924ca70a (diff) | |
| download | tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.tar.gz tor-600744b4be3d83a3e4924c8712bc30b7de1f4d3c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index f58876e496..74b02444e8 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2518,6 +2518,10 @@ typedef struct config_line_t { typedef struct routerset_t routerset_t; +/** A magic value for the (Socks|OR|...)Port options below, telling Tor + * to pick its own port. */ +#define CFG_AUTO_PORT 0xc4005e + /** Configuration options for a Tor process. */ typedef struct { uint32_t _magic; @@ -3057,6 +3061,11 @@ typedef struct { * If -1, Tor decides. */ int UseMicrodescriptors; + /** File where we should write the ControlPort. */ + char *ControlPortWriteToFile; + /** Should that file be group-readable? */ + int ControlPortFileGroupReadable; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |