Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d642da02

Commit d642da02 authored 3 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'tor-gitlab/mr/338'

parents 98282965 265cca93

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

changes/ticket40337 16 additions, 0 deletions

changes/ticket40337
doc/man/tor.1.txt 5 additions, 0 deletions

doc/man/tor.1.txt
src/app/config/config.c 2 additions, 0 deletions

src/app/config/config.c
src/app/config/or_options_st.h 4 additions, 0 deletions

src/app/config/or_options_st.h
src/app/config/testnet.inc 1 addition, 0 deletions

src/app/config/testnet.inc
src/feature/relay/router.c 4 additions, 1 deletion

src/feature/relay/router.c
src/feature/stats/bwhist.c 14 additions, 5 deletions

src/feature/stats/bwhist.c
src/feature/stats/bwhist.h 1 addition, 1 deletion

src/feature/stats/bwhist.h
src/test/test_relay.c 2 additions, 2 deletions

src/test/test_relay.c

with 49 additions and 9 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