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

[or-cvs] [tor/master] Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/master] Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 10 Feb 2011 20:50:26 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 10 Feb 2011 15:50:44 -0500
Patch-author: Robert Ransom <rransom.8774@xxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit 043d8d34a67fbe057a31bbe9c21299b6119fac21
Merge: 449d895 5fc6967
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Wed Feb 9 03:10:16 2011 -0800

    Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)

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