[tor-commits] [tor/master] Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046

[nickm at torproject.org]

commit 6443a756df2a94e70bc221830d49efb024e0a2ce
Merge: cc5b6d6 850d8c9
Author: Steven Murdoch <Steven.Murdoch at cl.cam.ac.uk>
Date:   Mon Aug 22 17:53:17 2011 +0100

    Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046
    
    Conflicts:
    	configure.in
    	src/tools/tor-fw-helper/Makefile.am
    	src/tools/tor-fw-helper/tor-fw-helper-upnp.c
    	src/tools/tor-fw-helper/tor-fw-helper.c

 changes/bug3752                              |    5 +++++
 configure.in                                 |    4 +++-
 src/common/compat_libevent.c                 |   11 +++++++++++
 src/common/compat_libevent.h                 |    1 +
 src/common/tortls.c                          |    2 +-
 src/or/buffers.c                             |   14 +++++++-------
 src/or/connection.c                          |    1 +
 src/tools/tor-fw-helper/Makefile.am          |    2 +-
 src/tools/tor-fw-helper/tor-fw-helper-upnp.c |    2 ++
 src/tools/tor-fw-helper/tor-fw-helper.c      |    4 +++-
 10 files changed, 35 insertions(+), 11 deletions(-)