diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:16:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:16:05 -0400 |
| commit | da30adcf0fd048d1f2e7a4b76e2c880cc3824e6e (patch) | |
| tree | eef8ad038eb361e3241c3b8f9997478c8522ce55 /src/or/or.h | |
| parent | 5f035e2c6501fe166900cb493e2c3de51371c9c5 (diff) | |
| parent | 9fec0c1a95ab24f5f18d6995e30fe2111e6b7db2 (diff) | |
| download | tor-da30adcf0fd048d1f2e7a4b76e2c880cc3824e6e.tar.gz tor-da30adcf0fd048d1f2e7a4b76e2c880cc3824e6e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/common/crypto.c
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 9a7c8b5e87..7b6c65fbb1 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2331,7 +2331,8 @@ typedef struct networkstatus_v2_t { typedef struct vote_microdesc_hash_t { /** Next element in the list, or NULL. */ struct vote_microdesc_hash_t *next; - /** The raw contents of the microdesc hash line, excluding the "m". */ + /** The raw contents of the microdesc hash line, from the "m" through the + * newline. */ char *microdesc_hash_line; } vote_microdesc_hash_t; |