diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-04-01 16:03:16 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-04-01 16:03:16 -0400 |
| commit | c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 (patch) | |
| tree | 6d11c441c5beb4d0589023aae6de17b0980ad6c0 /src/or/or.h | |
| parent | 341c6a59db09a43ee2301a6c59158b09ec55134b (diff) | |
| parent | 5fed1ccd901d4751a3fed7dc01042771ca76f449 (diff) | |
| download | tor-c7cbd06d5f2727c3742dfd426223f1f1ebe46f94.tar.gz tor-c7cbd06d5f2727c3742dfd426223f1f1ebe46f94.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 0a835029af..c323595f1e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3048,8 +3048,8 @@ typedef struct { * 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; + * authenticator for it. Used so we can do a time-independent comparison. */ + char *_BridgePassword_AuthDigest; int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ |