Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3e3040a5

Commit 3e3040a5 authored 8 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge branch 'maint-0.2.9'

Conflicts:
	src/or/rendservice.c

parents 7236e426 99944042

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

changes/20460 2 additions, 2 deletions

changes/20460
changes/bug20484 5 additions, 0 deletions

changes/bug20484
changes/bug20529 4 additions, 0 deletions

changes/bug20529
changes/bug20587 0 additions, 1 deletion

changes/bug20587
changes/bug20588 1 addition, 1 deletion

changes/bug20588
changes/geoip-november2016 1 addition, 1 deletion

changes/geoip-november2016
doc/tor.1.txt 4 additions, 0 deletions

doc/tor.1.txt
src/common/util.c 7 additions, 5 deletions

src/common/util.c
src/or/rendservice.c 52 additions, 24 deletions

src/or/rendservice.c
src/test/test.h 1 addition, 0 deletions

src/test/test.h
src/test/test_hs.c 32 additions, 23 deletions

src/test/test_hs.c
src/test/testing_common.c 30 additions, 4 deletions

src/test/testing_common.c

with 139 additions and 61 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