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

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

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/maint-0.2.2] Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 10 Feb 2011 20:47:07 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 10 Feb 2011 15:47:23 -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/maint-0.2.2] Update documentation for PublishServerDescriptor (0.2.2.x)
Next by Author: [or-cvs] [tor/maint-0.2.2] Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
Previous by thread: [or-cvs] [tor/maint-0.2.2] Ignore and warn about "PublishServerDescriptor hidserv"
Next by thread: [or-cvs] [tor/maint-0.2.2] Update documentation for PublishServerDescriptor (0.2.2.x)
Index(es):
- Author
- Thread