Nick Mathewson b0bab82790 Merge remote-tracking branch 'arma/bug3886' ... Conflicts: src/or/dirserv.c		2012-06-07 13:30:55 -04:00
..
common	Merge remote-tracking branch 'public/getfilesize_64'	2012-06-05 11:10:42 -04:00
config	Merge remote-tracking branch 'origin/maint-0.2.2'	2012-05-15 10:01:12 -04:00
or	Merge remote-tracking branch 'arma/bug3886'	2012-06-07 13:30:55 -04:00
test	Fix some mingw build warnings	2012-06-05 11:06:26 -04:00
tools	Update copyright dates to 2012; add a few missing copyright statements	2012-06-04 20:58:17 -04:00
win32	bump to 0.2.3.16-alpha-dev	2012-06-05 18:37:19 -04:00
Makefile.am	Move testing code into new src/test directory.	2009-09-23 00:24:43 -04:00