diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-17 16:45:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-17 16:45:53 -0400 |
| commit | 3b41551b61a604b555891ecc7cb6f8bbde65d128 (patch) | |
| tree | 4c97cb62f4170f0707d4ec921b271e4149259034 /src/or/or.h | |
| parent | cabb16caa9afb95ce0bfbda0d7784f71e4c153a1 (diff) | |
| download | tor-3b41551b61a604b555891ecc7cb6f8bbde65d128.tar.gz tor-3b41551b61a604b555891ecc7cb6f8bbde65d128.zip | |
Revert "Add an "auto" option to UseBridges"
This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/or/or.h b/src/or/or.h index 456dce2be4..97fecd1500 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2480,17 +2480,7 @@ typedef struct { * when doing so. */ char *BridgePassword; - /** Whether we should start all circuits with a bridge. "1" means strictly - * yes, "0" means strictly no, and "auto" means that we do iff any bridges - * are configured, we are not running a server and have not specified a list - * of entry nodes. */ - char *UseBridges_; - /** Effective value of UseBridges. Will be set equally for UseBridges set to - * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are - * configured, we are not running a server and have not specified a list of - * entry nodes. */ - int UseBridges; - + int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make |