Commit 3807a30b03ab42f2f503f2db62b1ef5876e2be80

Nick Mathewson 2013-08-19T10:05:14

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: util-internal.h