Nick Mathewson 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 ...

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

2013-03-19 16:15:27 -04:00

..

contrib

Remove incentives.txt from tor git; putting it into torspec.

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

spec

prefer https urls

2011-02-22 14:39:09 -05:00

asciidoc-helper.sh

Improve asciidoc-helper's suggestion of what to install

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

HACKING

Fix instructions for using Tor with gcov

2012-10-24 15:03:49 -04:00

include.am

Fix dependency checking on manpage builds

2012-09-14 10:36:42 -04:00

state-contents.txt

Explain TransportProxy within doc/state-contents.txt.

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

TODO

Remove the obsolete doc/TODO.* files

2012-12-17 22:26:05 -05: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-rpm-creation.txt

Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.

2012-07-31 11:41:40 -04:00

tor-win32-mingw-creation.txt

…

tor.1.txt

Merge branch 'bug8240_v2_squashed' into maint-0.2.4

2013-03-19 16:15:27 -04:00

torify.1.txt

Remove some lingering tsocks cruft.

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

translations.txt

…

v3-authority-howto.txt

…