commit f2e4423bd2bf684849c968ff6bb19dfc3ee7d788 Merge: a4cf2ae d87d418 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 30 11:46:56 2014 -0500

Merge remote-tracking branch 'yawning/bug13315_fixup'

src/or/buffers.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)