Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e908e3a3

Commit e908e3a3 authored 13 years ago by Nick Mathewson

Downloads
- Plain Diff

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

Fixed trivial conflict due to headers moving into their own .h files
from or.h.

Conflicts:
	src/or/or.h

parents 919bf6ff 4a22046c

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changes/check-fetched-rend-desc-service-id 7 additions, 0 deletions

changes/check-fetched-rend-desc-service-id
changes/check-public-key-exponents 5 additions, 0 deletions

changes/check-public-key-exponents
src/common/crypto.c 12 additions, 0 deletions

src/common/crypto.c
src/common/crypto.h 1 addition, 0 deletions

src/common/crypto.h
src/or/directory.c 3 additions, 2 deletions

src/or/directory.c
src/or/rendcommon.c 21 additions, 1 deletion

src/or/rendcommon.c
src/or/rendcommon.h 2 additions, 1 deletion

src/or/rendcommon.h
src/or/routerparse.c 17 additions, 0 deletions

src/or/routerparse.c

with 68 additions and 4 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