Merge remote-tracking branch 'public/bug5598'

Conflicts:
	doc/tor.1.txt

Conflict was on a formatting issue in the manpage.

diff --cc doc/tor.1.txt
index 3e7541b2a06585e0b2ec6249b532df2be0db5893,f5e5b86c2922f13ba59aba026043ebe9de7748d8..78a33ca7937b3253a8970b439df60570db18c386
--- 1/doc/tor.1.txt
--- 2/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -266,7 -266,7 +266,7 @@@ Other options can be specified either o
      If this option is set to 1, when running as a server, generate our
      own Diffie-Hellman group instead of using the one from Apache's mod_ssl.
      This option may help circumvent censorship based on static
-     Diffie-Hellman parameters. (Default: 1)
 -    Diffie-Hellman parameters. (Default: 0).
++    Diffie-Hellman parameters. (Default: 0)
  
  **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ +
  

diff --cc src/or/config.c
Simple merge