Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tor
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

9ae8d663

Unverified Commit 9ae8d663 authored 6 years ago by teor

Downloads
- Plain Diff

Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0

parents 06951cb3 5d2f5e48

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug28925 4 additions, 0 deletions

changes/bug28925
src/core/mainloop/connection.c 11 additions, 5 deletions

src/core/mainloop/connection.c
src/core/mainloop/connection.h 1 addition, 1 deletion

src/core/mainloop/connection.h
src/core/or/connection_or.c 13 additions, 3 deletions

src/core/or/connection_or.c
src/core/or/or_connection_st.h 2 additions, 0 deletions

src/core/or/or_connection_st.h

with 31 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