Nick Mathewson 96211bcf71 Merge branch 'bug9321_rerebase' ...

Conflicts:
	src/or/dirvote.h
	src/test/include.am
	src/test/test_entrynodes.c

2015-02-18 09:17:02 -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

building-tor-msvc.txt

Updated building-tor-msvc.txt

2014-09-09 10:33:45 -04:00

HACKING

give dist-master an alias

2014-10-21 16:01:29 -04:00

include.am

Fix build of torify.1

2014-03-26 12:12:54 -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

Tweak tor-resolve docs and logs

2015-01-28 10:11:08 -05:00

tor.1.txt

Merge branch 'bug9321_rerebase'

2015-02-18 09:17:02 -05:00

torify.1.txt

Remove some lingering tsocks cruft.

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

TUNING

Updating OpenBSD section of doc/TUNING.

2015-02-01 19:52:54 +02:00