tor/changes
Nick Mathewson b998431a33 Merge branch '024_msvc_squashed'
Conflicts:
	src/or/or.h
	 srcwin32/orconfig.h
2013-01-16 22:32:12 -05:00
..
7304 Fix an instance of snprintf; don't use _snprintf directly 2013-01-16 22:29:39 -05:00
bug7115 Remove two extrneous semicolons in dirserv.c 2013-01-16 16:49:39 -05:00
bug7889 Reject create/begin/etc cells with {circ,stream}ID 0. 2013-01-14 14:02:13 -05:00
bug7896 changes file for 7896 2013-01-16 11:43:36 -05:00
bug7972 Actually link against nacl when we want to use it 2013-01-16 13:07:52 -05:00
build_with_msvc Changes files for 024_msvc branch 2013-01-16 22:29:39 -05:00
enum_bitfield Changes files for 024_msvc branch 2013-01-16 22:29:39 -05:00
msvc Definx HAVE_EVENT_BASE_LOOPEXITin msvc orconfig.h 2013-01-16 16:32:38 -05:00
rename5285 Aftermath of isin->contains renaming 2013-01-16 16:57:32 -05:00