Commit 56c6afe26ad0a1bf5895ab9f4ebacaf2db3902f2

Nick Mathewson 2011-12-07T18:17:34

Merge branch '21_ifaddr'