Nick Mathewson b4b91864bb Merge remote-tracking branch 'public/bug9870' ...

Conflicts:
	src/or/config.c

2014-04-01 20:48:15 -04:00

..

bug7164_diagnose_harder

More logs to try to diagnose bug 7164

2014-03-27 14:23:19 -04:00

bug8787

changes file for bug8787

2014-03-31 11:57:40 -04:00

bug9107

Remove the unused circuit_dump_by_chan().

2014-03-23 00:28:39 -04:00

bug9870

Log only one message for dangerous log settings.

2014-02-12 15:32:50 -05:00

bug11061

Fix SOCKSPort documentation layout

2014-03-25 10:01:08 -04:00

bug11070

Take out remaining V1 directory code.

2014-03-18 10:40:10 +01:00

bug11232

changes file for bug11232

2014-03-18 10:59:51 -04:00

bug11275

changes file for bug 11275

2014-03-23 15:55:13 -04:00

bug11276

Changes file for bug 11276.

2014-03-23 15:59:51 -04:00

bug11279

Demote "Invalid length on ESTABLISH_RENDEZVOUS" to protocol_warn

2014-03-25 11:55:27 -04:00

bug11296

Fix version number in changes/bug11296

2014-03-26 14:10:07 -04:00

bug11321

Fix build of torify.1

2014-03-26 12:12:54 -04:00

bug11342

Make dump_desc() use binary mode

2014-03-27 23:53:03 -04:00

doxygen_fixes

Fix warnings from doxygen

2014-03-25 11:27:43 -04:00

require_023

Be more lenient in our fix for bug 11149

2014-03-23 02:53:08 -04:00