diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-27 22:18:16 -0500 |
| commit | 190c1d4981e5751aabd3d894095851c830f1d570 (patch) | |
| tree | a832d932339382cb7f43fb33a255d7507e037c2e /src/or/or.h | |
| parent | 267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 (diff) | |
| parent | 6f21d2e49657ada264cace9da7cf6945b4fc073d (diff) | |
| download | tor-190c1d4981e5751aabd3d894095851c830f1d570.tar.gz tor-190c1d4981e5751aabd3d894095851c830f1d570.zip | |
Merge branch 'bug7013_take2_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index a8645f854e..2ac9f6bdeb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3260,6 +3260,9 @@ typedef struct { config_line_t *ServerTransportPlugin; /**< List of client transport plugins. */ + /** List of TCP/IP addresses that transports should listen at. */ + config_line_t *ServerTransportListenAddr; + int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make * this explicit so we can change how we behave in the * future. */ |