Nick Mathewson 1bbd3811c1 Merge remote-tracking branch 'public/bug10849_025' ... Conflicts: src/or/config.c		2014-05-01 11:51:22 -04:00
..
bug8368	Add contrib/tor.service for use with systemd	2014-04-29 13:17:29 -04:00
bug10849_023	Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS	2014-04-25 14:24:41 -04:00
bug10849_025	Remove TunnelDirConns and PreferTunnelledDirConns	2014-02-11 11:10:55 -05:00
bug11605	Make compilation of tor_memdup_nulterm() with dmalloc	2014-04-25 13:52:07 -04:00
bug11608	Make the python test scripts work on python3	2014-04-27 22:54:24 -04:00
bug11623	Changes file for bug 11623 (fix was in 91ff10f6be)	2014-05-01 11:33:17 -04:00
bug11628	New --disable-seccomp option to turn off support for seccomp.	2014-04-28 11:11:50 -04:00
bug11632	Changes file for bug 11632.	2014-04-29 11:58:43 -04:00
bug11633_part1	changes file for last patch	2014-04-29 13:23:54 -04:00
bug11634	changes file for 11634 documentation fixes	2014-04-28 12:40:23 -04:00
bug11635	Actually put ExtORPortCookieAuthFile into config.c	2014-04-28 12:23:18 -04:00
md_leak_bug	Stop leaking memory in error cases of md parsing	2014-04-29 13:00:00 -04:00
ticket8368	Put tor.service in the right place, and autoconfify it	2014-04-29 13:17:30 -04:00
ticket8966	Deal with the aftermath of sorting contrib	2014-04-28 11:59:55 -04:00