Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

84a5bd48

Commit 84a5bd48 authored 4 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5

parents ed6a3282 435f31ae

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

changes/ticket40081 6 additions, 0 deletions

changes/ticket40081
src/core/or/channel.c 6 additions, 38 deletions

src/core/or/channel.c
src/core/or/channel.h 3 additions, 6 deletions

src/core/or/channel.h
src/core/or/channeltls.c 10 additions, 22 deletions

src/core/or/channeltls.c
src/core/or/circuitbuild.c 2 additions, 0 deletions

src/core/or/circuitbuild.c
src/test/test_channel.c 5 additions, 8 deletions

src/test/test_channel.c

with 32 additions and 74 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