Nick Mathewson 90b9e23bec Merge branch 'exitnode_10067_squashed' ... Conflicts: src/or/or.h		2015-01-06 15:15:18 -05:00
..
bug11791	Use smaller zlib objects when under memory pressure	2014-11-17 11:43:50 -05:00
bug12509	Prevent changes to other options from removing . from AutomapHostsSuffixes	2015-01-04 17:28:54 -05:00
bug14072	Use package-config output for -lsystemd correctly	2015-01-06 14:07:13 -05:00
bug14106	Tolerate starting up with missing hidden service directory	2015-01-05 11:39:38 -05:00
bug14116_025	Don't crash on malformed EXTENDCIRCUIT.	2015-01-06 08:49:57 -05:00
bug14123	changes file for 4385211caf	2015-01-06 13:45:57 -05:00
feature10067	changes file for 10067	2015-01-06 14:31:20 -05:00
fix-test-cmdline-args	Make test_cmdline_args.py work on Windows	2015-01-06 13:26:52 -05:00
ticket14107	make "make test-stem" run stem tests on tor	2015-01-06 09:03:44 -05:00