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

[nickm at torproject.org]

commit 283730ad1cdd911d1a669ea730741f35aa6b7f66
Merge: 9114346 789c8d8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 13 15:11:52 2014 -0400

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

 changes/test.h_msvc |    3 +++
 src/test/test.h     |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)