Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

Tor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ffc21b65

Commit ffc21b65 authored 12 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/maint-0.2.2'

(For bug 5969 fix)

parents fe68a80f 3a9351b5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug5969_022 7 additions, 0 deletions

changes/bug5969_022
src/common/compat.h 3 additions, 2 deletions

src/common/compat.h
src/common/log.c 7 additions, 0 deletions

src/common/log.c
src/common/util.h 5 additions, 1 deletion

src/common/util.h
src/or/control.c 13 additions, 3 deletions

src/or/control.c

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