Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

701a1936

Commit 701a1936 authored 4 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge branch 'maint-0.3.5' into maint-0.4.3

parents a4937384 ad7ffa52

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

changes/ticket33747 7 additions, 0 deletions

changes/ticket33747
src/core/mainloop/connection.c 6 additions, 1 deletion

src/core/mainloop/connection.c
src/core/or/connection_st.h 3 additions, 0 deletions

src/core/or/connection_st.h
src/feature/relay/ext_orport.c 4 additions, 0 deletions

src/feature/relay/ext_orport.c

with 20 additions and 1 deletion

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