diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
| commit | 12cf73c4516132a85f76d1c6e60c9492e8751987 (patch) | |
| tree | 11254e166ba6134597416fa2a8d91c3178212853 /changes | |
| parent | ec4142abdf7fa4efaa281413e31acc93bf22ea4a (diff) | |
| parent | 1c6f8841f47d5d55e73d18a9414fc68377a13c0e (diff) | |
| download | tor-12cf73c4516132a85f76d1c6e60c9492e8751987.tar.gz tor-12cf73c4516132a85f76d1c6e60c9492e8751987.zip | |
Merge remote-tracking branch 'andrea/ticket19858_v2'
Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket19858 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/ticket19858 b/changes/ticket19858 new file mode 100644 index 0000000000..41cc961455 --- /dev/null +++ b/changes/ticket19858 @@ -0,0 +1,4 @@ + o Features (guards): + - Abolish all global guard context in entrynodes.c; replace with new + guard_selection_t structure as preparation for prop. 271. Closes + ticket 19858. |