Commit 9ae6e5959d1c30d6043d4bb20f4d8741aec30a46

Nick Mathewson 2011-11-14T11:45:17

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: sample/dns-example.c