diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-24 19:37:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-24 19:37:11 -0400 |
| commit | 8d908b961fc90628c449b344f5181eeec3e3bd70 (patch) | |
| tree | b00233f87957295243413789be13270a0981aca0 /src/or/or.h | |
| parent | 8cc57bccfe9acd3d64ef30349c3727586e253bb3 (diff) | |
| parent | b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee (diff) | |
| download | tor-8d908b961fc90628c449b344f5181eeec3e3bd70.tar.gz tor-8d908b961fc90628c449b344f5181eeec3e3bd70.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index f1e78ab025..26f00b7181 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3770,6 +3770,10 @@ typedef struct { int BridgeAuthoritativeDir; /**< Boolean: is this an authoritative directory * that aggregates bridge descriptors? */ + /** If set on a bridge relay, it will include this value on a new + * "bridge-distribution-request" line in its bridge descriptor. */ + char *BridgeDistribution; + /** If set on a bridge authority, it will answer requests on its dirport * for bridge statuses -- but only if the requests use this password. */ char *BridgePassword; |