[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5598'

[nickm at torproject.org]

commit 70910479e383806b98f15490abc5e45ceb1066d5
Merge: a6180b7 8a341cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 11 10:26:48 2012 -0400

    Merge remote-tracking branch 'public/bug5598'
    
    Conflicts:
    	doc/tor.1.txt
    
    Conflict was on a formatting issue in the manpage.

 changes/bug5598 |    5 +++++
 doc/tor.1.txt   |    2 +-
 src/or/config.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index 3e7541b,f5e5b86..78a33ca
--- a/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__ +