]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2_secfix' into master_secfix
authorSebastian Hahn <sebastian@torproject.org>
Wed, 26 Oct 2011 22:15:25 +0000 (00:15 +0200)
committerSebastian Hahn <sebastian@torproject.org>
Wed, 26 Oct 2011 22:38:45 +0000 (00:38 +0200)
commit2dec6597af4014eb731d8caac55a8a87964ce371
treebb2b9020ab2d67f46a619026530c57ec607c07bb
parent2c4e89b86703f188f45f9edfc0fd3e4bbeac3511
parent4684ced1b3fced0543fa65bf01f75c5d81eaf464
Merge branch 'maint-0.2.2_secfix' into master_secfix

Conflicts:
src/common/tortls.c
src/or/connection_or.c
src/or/dirserv.c
src/or/or.h
src/common/tortls.c
src/or/command.c
src/or/config.c
src/or/connection_or.c
src/or/dirserv.c
src/or/or.h
src/or/routerparse.c