Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

tor
- Activity
- Members
- Labels

Snippets Groups Projects

37ca182c

Commit 37ca182c authored 15 years ago by Roger Dingledine

Downloads
- Plain Diff

Merge branch 'maint-0.2.1' into master

Conflicts:

	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h

parents 4728bd90 f43f87db

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 16 additions, 0 deletions

ChangeLog
ReleaseNotes 17 additions, 1 deletion

ReleaseNotes
contrib/tor-mingw.nsi.in 0 additions, 1 deletion

contrib/tor-mingw.nsi.in
src/or/config.c 6 additions, 5 deletions

src/or/config.c
src/or/directory.c 2 additions, 1 deletion

src/or/directory.c
src/or/routerlist.c 1 addition, 1 deletion

src/or/routerlist.c

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