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

[or-cvs] [tor/master] Merge maint-0.2.1 with -s ours.

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/master] Merge maint-0.2.1 with -s ours.
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:38 -0500
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit 7abb74e4ac3f284f0682764dd5f26571dd624c13
Merge: 20d4933 50c259d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 10 15:56:06 2011 -0500

    Merge maint-0.2.1 with -s ours.

Prev by Author: [or-cvs] [tor/maint-0.2.2] Merge maint-0.2.1 with -s ours.
Next by Author: [or-cvs] [tor/master] Make the DH parameter we use for TLS match the one from Apache's mod_ssl
Previous by thread: [or-cvs] [tor/maint-0.2.2] Merge maint-0.2.1 with -s ours.
Next by thread: [or-cvs] [tor/master] Make the DH parameter we use for TLS match the one from Apache's mod_ssl
Index(es):
- Author
- Thread