Commit caf133f90198961c1f9b8bdc74dd6f5385ec00b3

Nick Mathewson 2011-09-12T10:09:28

Merge branch 'new_configure_options'