Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

18654b62

Commit 18654b62 authored 4 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'tor-gitlab/mr/266' into maint-0.4.5

parents 27ee1283 9321ddf3

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/app/config/config.c 12 additions, 4 deletions

src/app/config/config.c
src/feature/relay/relay_config.c 19 additions, 6 deletions

src/feature/relay/relay_config.c
src/feature/relay/relay_config.h 6 additions, 0 deletions

src/feature/relay/relay_config.h
src/test/test_config.c 88 additions, 1 deletion

src/test/test_config.c

with 125 additions and 11 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