Commit a5d43cf4c6a6d4c1fbb7ed244eac9124317d273d

Nick Mathewson 2014-11-30T11:09:50

Merge branch 'evbufer_peek_fix_v3'