Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tor
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5f42bc0f

Commit 5f42bc0f authored 6 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'tor-github/pr/699'

parents 5687165c b61c3c6d

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

changes/ticket26698 4 additions, 0 deletions

changes/ticket26698
src/app/config/config.c 2 additions, 1 deletion

src/app/config/config.c
src/feature/dirauth/bwauth.c 23 additions, 5 deletions

src/feature/dirauth/bwauth.c
src/feature/dirauth/bwauth.h 2 additions, 2 deletions

src/feature/dirauth/bwauth.h
src/feature/dirauth/dirvote.c 37 additions, 3 deletions

src/feature/dirauth/dirvote.c
src/feature/nodelist/networkstatus_st.h 3 additions, 0 deletions

src/feature/nodelist/networkstatus_st.h
src/test/test_dir.c 107 additions, 16 deletions

src/test/test_dir.c

with 178 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment