Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

80038b54

Commit 80038b54 authored 13 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2

parents 385c5979 fc4158da

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug3309 13 additions, 0 deletions

changes/bug3309
src/or/main.c 1 addition, 2 deletions

src/or/main.c
src/or/rendclient.c 43 additions, 3 deletions

src/or/rendclient.c
src/or/rendclient.h 3 additions, 0 deletions

src/or/rendclient.h
src/or/rendcommon.c 3 additions, 1 deletion

src/or/rendcommon.c

with 63 additions and 6 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