Karsten Loesing 2e0fad542c Merge branch 'morestats4' into morestats5 ...

Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/connection.h
	src/or/control.c
	src/or/control.h
	src/or/or.h
	src/or/relay.c
	src/or/relay.h
	src/test/test.c

2013-10-28 12:09:42 +01: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

name it correctly, maybe

2013-10-01 15:47:38 -04:00

include.am

Don't preprocess torify

2013-09-29 13:59:17 -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 branch 'morestats4' into morestats5

2013-10-28 12:09:42 +01:00

torify.1.txt

Remove some lingering tsocks cruft.

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