[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 10 Feb 2011 20:53:31 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 10 Feb 2011 15:53:45 -0500
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit e460586a13875c0dac988365ce7993ef97660572
Merge: f1a0047 7abb74e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 10 15:56:18 2011 -0500

    Merge remote-tracking branch 'origin/maint-0.2.2'

Prev by Author: [or-cvs] [tor/master] Make the DH parameter we use for TLS match the one from Apache's mod_ssl
Next by Author: [or-cvs] [tor/maint-0.2.2] Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
Previous by thread: [or-cvs] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
Next by thread: [or-cvs] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
Index(es):
- Author
- Thread