[tor-commits] [tor/master] Merge branch 'win32_winnt'

[nickm at torproject.org]

commit d5ccaa6e2b8c73a1d9d43b82c782c7b10557fe5c
Merge: 1150b6b 21e3261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 09:56:49 2012 -0400

    Merge branch 'win32_winnt'

 changes/bug5861     |    4 ++++
 configure.in        |    6 ++----
 src/common/aes.c    |    5 +----
 src/common/compat.h |    5 +----
 src/common/crypto.c |    5 +----
 src/common/tortls.c |    5 +----
 src/or/or.h         |    5 +----
 7 files changed, 11 insertions(+), 24 deletions(-)