Roger Dingledine 87576e826f Merge branch 'maint-0.2.4' into maint-0.2.5 ... Conflicts: src/or/config.c		2014-09-20 16:50:32 -04:00
..
common	Clean up the MVSC nmake files so they work again.	2014-09-09 10:27:05 -04:00
config	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2014-08-13 12:52:40 -04:00
ext	Clean up the MVSC nmake files so they work again.	2014-09-09 10:27:05 -04:00
or	Merge branch 'maint-0.2.4' into maint-0.2.5	2014-09-20 16:50:32 -04:00
test	Remove stale printfs from buffer/zlib_fin_at_chunk_end test	2014-08-15 09:34:10 -04:00
tools	scan-build: close stdio FILEs on error in tor-gencert	2014-04-19 12:47:58 -04:00
win32	Bump maint-0.2.5 to 0.2.5.7-rc-dev	2014-09-11 21:38:32 -04:00
include.am	Move all externally maintained source files into src/ext	2012-10-11 17:22:03 -04:00