diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-24 19:35:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-24 19:35:28 -0400 |
| commit | 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb (patch) | |
| tree | c4358510a57824e1b21b5de6adfdfff30626e027 /src/or/or.h | |
| parent | 122a7f8848785e3cefef812749c7ec1844b26402 (diff) | |
| parent | 02cde0d9398c43de3a67133b7982d9df6962fe32 (diff) | |
| download | tor-594cf92498c8ea12dc0b19f743d6b88d4a98f1eb.tar.gz tor-594cf92498c8ea12dc0b19f743d6b88d4a98f1eb.zip | |
Merge branch 'feature18329_029_squashed' into 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 8c1ef478ed..d9ab815cbc 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; |