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

[nickm at torproject.org]

commit 04755ff764d111861902749784408432fcc8ce4e
Merge: 83e069f dd22ab5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 9 10:52:21 2014 -0400

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

 Makefile.nmake            |    4 ++++
 changes/bug12700          |   10 ++++++++++
 changes/bug13071          |    3 +++
 changes/bug13081          |    3 +++
 src/common/Makefile.nmake |    9 +++++----
 src/ext/Makefile.nmake    |   12 ++++++++++++
 src/or/Makefile.nmake     |    8 +++++---
 src/or/directory.c        |   12 +++++++-----
 src/or/relay.c            |    8 +++++++-
 src/win32/orconfig.h      |    8 ++++++++
 10 files changed, 64 insertions(+), 13 deletions(-)