diff options
author | teor <teor@torproject.org> | 2020-04-03 21:59:19 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-04-03 21:59:19 +1000 |
commit | 0efcdb8918681763799b871b53785d77edbbf088 (patch) | |
tree | a3976d40a5ffe4d4e858233e1d01381c5018338f /src/feature/dirauth/voting_schedule.h | |
parent | a762234ba27d89f3394e560c2b0cf976648ca779 (diff) | |
parent | b1a571f0387aa07f11e79147209a8c74c9937a04 (diff) | |
download | tor-0efcdb8918681763799b871b53785d77edbbf088.tar.gz tor-0efcdb8918681763799b871b53785d77edbbf088.zip |
Merge remote-tracking branch 'tor-github/pr/1739'
Ignored conflicting style changes: they will be re-applied in
the next commit.
Diffstat (limited to 'src/feature/dirauth/voting_schedule.h')
0 files changed, 0 insertions, 0 deletions