Commit eb6b0c1f90136b374dfa9afd532fde4020ac7a67

Nick Mathewson 2013-04-25T10:47:16

Merge branch '21_evdns_disable_when_inactive'