Nick Mathewson a11c30b5fe Merge remote branch 'origin/patches-2.0'
This branch is the big one that merges all the ntp folks' changes

Conflicts:
	configure.in
2011-02-22 17:41:27 -05:00
..
2010-10-05 14:29:48 -04:00
2010-10-14 14:40:40 -04:00
2010-11-03 23:30:29 -04:00
2010-12-09 11:43:12 -05:00
2011-02-22 00:31:56 -05:00