Roger Dingledine b586709c54 Merge branch 'maint-0.2.2' into release-0.2.2

2011-05-30 16:20:18 -04:00

..

bug1297a

Use the normal four-hop CBT for client intro circuits

2011-05-30 12:24:51 -04:00

bug3045

changes file for bug3045

2011-05-15 22:02:24 -04:00

bug3216

Don't build descriptors if ORPort auto is set and we have no OR listener

2011-05-24 21:12:23 +02:00

bug3228

Reinit keys at the start of options_act().

2011-05-30 12:41:46 -04:00

bug3270

Use a 64-bit type to hold sockets on win64.

2011-05-23 00:17:48 -04:00

bug3289

Warn when two hs use the same directory

2011-05-30 15:47:06 -04:00