Commit 8771d5b6466441cfe2be7a9847b9b5d04be9a1ba

Nick Mathewson 2010-01-07T02:25:48

Merge branch 'readln-backport' into patches-1.4