diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-10 11:12:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-10 11:12:24 -0400 |
| commit | d76cffda601eed40d6a81eadb1240d98ee1e70a2 (patch) | |
| tree | a153bd842af1f4f8741490fe71245bf99f913d84 /src/or/or.h | |
| parent | 8266d193a608445b0d8675a83733870a2733e2b9 (diff) | |
| parent | 9fc1346df2e1402a6895bdf826f8757da7e49608 (diff) | |
| download | tor-d76cffda601eed40d6a81eadb1240d98ee1e70a2.tar.gz tor-d76cffda601eed40d6a81eadb1240d98ee1e70a2.zip | |
Merge remote-tracking branch 'public/my-family-list-fix-4498'
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 0bf7ceb4e8..9027f312f9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3926,7 +3926,8 @@ typedef struct { /** If set, use these bridge authorities and not the default one. */ config_line_t *AlternateBridgeAuthority; - char *MyFamily; /**< Declared family for this OR. */ + config_line_t *MyFamily_lines; /**< Declared family for this OR. */ + config_line_t *MyFamily; /**< Declared family for this OR, normalized */ config_line_t *NodeFamilies; /**< List of config lines for * node families */ smartlist_t *NodeFamilySets; /**< List of parsed NodeFamilies values. */ |