Sebastian Hahn 2dec6597af 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

2011-10-27 00:38:45 +02:00

..

issue-2011-10-19L

Don't give the Guard flag to relays without the CVE-2011-2768 fix

2011-10-26 23:42:39 +02:00

issue-2011-10-23G

Reject create cells on outgoing OR connections from bridges

2011-10-26 23:21:14 +02:00