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

[nickm at torproject.org]

commit 33fab2846af4079308006354f51343c7f7b4fd4a
Merge: ff4ba9f 0cb028b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 15 10:07:04 2014 -0400

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

 src/test/test_buffers.c |    3 ---
 1 file changed, 3 deletions(-)