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

17fdde3d

Commit 17fdde3d authored 14 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	src/common/tortls.c

parents f3eb2a10 441241c1

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/common/tortls.c 115 additions, 23 deletions

src/common/tortls.c
src/common/tortls.h 4 additions, 1 deletion

src/common/tortls.h
src/or/connection_or.c 4 additions, 1 deletion

src/or/connection_or.c
src/or/dirserv.c 4 additions, 3 deletions

src/or/dirserv.c
src/or/hibernate.c 2 additions, 2 deletions

src/or/hibernate.c
src/or/main.c 9 additions, 5 deletions

src/or/main.c
src/or/router.c 118 additions, 32 deletions

src/or/router.c
src/or/router.h 7 additions, 3 deletions

src/or/router.h

with 263 additions and 70 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