Nick Mathewson 5c45a333c3 Merge remote-tracking branch 'public/bug10169_023' into bug10169_024 ...

Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/or.h

The conflicts were all pretty trivial.

2014-01-03 10:53:22 -05:00

..

contrib

Remove various outdated documents.

2013-06-12 21:11:49 -04:00

asciidoc-helper.sh

Improve asciidoc-helper's suggestion of what to install

2013-03-15 11:18:25 -04:00

HACKING

Fix the biggest errors in doc/HACKING

2013-06-12 21:27:30 -04:00

include.am

Remove various outdated documents.

2013-06-12 21:11:49 -04:00

state-contents.txt

Explain TransportProxy within doc/state-contents.txt.

2012-03-31 14:33:11 +02:00

tor-fw-helper.1.txt

Use --test-commandline name in tor-fw-helper manpage

2013-03-19 15:11:34 -04:00

tor-gencert.1.txt

Add some attributes to make a2x quieter

2012-08-23 13:19:54 -04:00

tor-resolve.1.txt

Add some attributes to make a2x quieter

2012-08-23 13:19:54 -04:00

tor.1.txt

Merge remote-tracking branch 'public/bug10169_023' into bug10169_024

2014-01-03 10:53:22 -05:00

torify.1.txt

Remove some lingering tsocks cruft.

2013-02-27 19:39:57 -05:00