diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-01 00:46:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-01 00:46:52 -0400 |
| commit | 341c6a59db09a43ee2301a6c59158b09ec55134b (patch) | |
| tree | 064d7997faa86393decb522b2c6267003c195d5c /src/or/or.h | |
| parent | 458718d4975661831fa21d9f2653932e17c1bae0 (diff) | |
| parent | 9a69c24150965e54322ed9616638d4f1939b1289 (diff) | |
| download | tor-341c6a59db09a43ee2301a6c59158b09ec55134b.tar.gz tor-341c6a59db09a43ee2301a6c59158b09ec55134b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
Conflict was in or_options_free, where two newly added fields had free
calls in the same place.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 4996fd33af..0a835029af 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3045,10 +3045,11 @@ typedef struct { * that aggregates bridge descriptors? */ /** If set on a bridge authority, it will answer requests on its dirport - * for bridge statuses -- but only if the requests use this password. - * If set on a bridge user, request bridge statuses, and use this password - * when doing so. */ + * for bridge statuses -- but only if the requests use this password. */ char *BridgePassword; + /** If BridgePassword is set, this is a SHA256 digest of the basic http + * authenticator for it. */ + char *BridgePassword_AuthDigest; int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ |