[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit e7e92fb2f9e45c18ac23c90efe2eb32cf3f4a953
Merge: a36cd51 fa8bb25
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 21 14:01:00 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5'

 changes/bufferevent_compilation |    5 +++--
 src/or/channel.c                |    7 ++++---
 src/test/test_oom.c             |   13 +++++++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)