Commit 83588777682b2a7d9044f527dc4acbec70775fa9

Nick Mathewson 2011-10-06T15:21:55

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: buffer.c test/regress_buffer.c