Merge remote branch 'sebastian/bug1254'
commitc084ae145e7eb77303ce401083a94b0d9d7fe57e
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Feb 2010 17:45:01 +0000 (22 12:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Feb 2010 17:45:01 +0000 (22 12:45 -0500)
treeb83535c6d5e93f8a4b8db13d1c9ff7568bc47939
parentd35b8dc5827762cd9cbee90f57ef370f477539fb
parentf5112fa48754b33aa46c1bf79e11cf400d5084a8
Merge remote branch 'sebastian/bug1254'
ChangeLog