]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch '024_msvc_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Jan 2013 03:32:12 +0000 (22:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Jan 2013 03:32:12 +0000 (22:32 -0500)
commitb998431a33db2be0246f176ea0077b98d5258866
treed03935b5fbc9e8f6327af93b2897fc1f34d931fe
parent8b62a738b3add64dcd26a82dff44a7e9e11ff5a9
parentb7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f
Merge branch '024_msvc_squashed'

Conflicts:
src/or/or.h
 srcwin32/orconfig.h
src/common/compat.h
src/common/crypto.c
src/common/torint.h
src/common/tortls.c
src/common/util.c
src/or/addressmap.c
src/or/channel.h
src/or/or.h
src/or/routerparse.c
src/win32/orconfig.h