diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:05:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:05:13 -0400 |
| commit | ed39621a9d97dc07063b6e9052b52a91b99d82d6 (patch) | |
| tree | 56c4e4aa1f00f4b53a0ef1ac2c8e06d1da4ff376 /src/or/or.h | |
| parent | 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 (diff) | |
| parent | 1174bb95ce79767cfaee4f50ce70f42e7eb01b2e (diff) | |
| download | tor-ed39621a9d97dc07063b6e9052b52a91b99d82d6.tar.gz tor-ed39621a9d97dc07063b6e9052b52a91b99d82d6.zip | |
Merge remote-tracking branch 'asn2/bug3656'
Conflicts:
src/common/util.c
src/common/util.h
src/or/config.h
src/or/main.c
src/test/test_util.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 5c645927e3..d6eaeb6f17 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2879,6 +2879,9 @@ typedef struct { config_line_t *ClientTransportPlugin; /**< List of client transport plugins. */ + config_line_t *ServerTransportPlugin; /**< List of client + transport plugins. */ + int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make * this explicit so we can change how we behave in the * future. */ @@ -3350,6 +3353,8 @@ typedef struct { /** A list of Entry Guard-related configuration lines. */ config_line_t *EntryGuards; + config_line_t *TransportProxies; + /** These fields hold information on the history of bandwidth usage for * servers. The "Ends" fields hold the time when we last updated the * bandwidth usage. The "Interval" fields hold the granularity, in seconds, |