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

41eef668

Commit 41eef668 authored 13 years ago by Nick Mathewson

Downloads
- Plain Diff

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

Conflicts:
	src/or/dirserv.c
	src/or/networkstatus.c

Conflicts were related to routerinfo->node shift.

parents c6ea014b dfa6cde4

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug2649a 5 additions, 0 deletions

changes/bug2649a
changes/bug2649b 5 additions, 0 deletions

changes/bug2649b
doc/tor.1.txt 6 additions, 1 deletion

doc/tor.1.txt
src/or/config.c 2 additions, 1 deletion

src/or/config.c
src/or/dirserv.c 12 additions, 5 deletions

src/or/dirserv.c
src/or/dirvote.h 1 addition, 1 deletion

src/or/dirvote.h
src/or/networkstatus.c 1 addition, 1 deletion

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

src/or/or.h

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