Commit de5428e7d50338ffa9f54fdb93283b28cea57f87

Nick Mathewson 2011-12-08T14:04:04

Merge remote-tracking branch 'fancycode/buffer_references' Conflicts: buffer.c