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

[nickm at torproject.org]

commit 29979082286cc8fa4dadf4e1fcbe85a1aa58d757
Merge: ad0ae89 8391c96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 9 10:27:41 2014 -0400

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

 Makefile.nmake            |    4 ++++
 changes/bug13081          |    3 +++
 src/common/Makefile.nmake |    9 +++++----
 src/ext/Makefile.nmake    |   12 ++++++++++++
 src/or/Makefile.nmake     |    8 +++++---
 src/win32/orconfig.h      |    8 ++++++++
 6 files changed, 37 insertions(+), 7 deletions(-)