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

[or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
From: arma@xxxxxxxxxxxxxx
Date: Sat, 15 Jan 2011 22:31:46 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Sat, 15 Jan 2011 17:32:50 -0500
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit 029ca804b2bed051185cc21477a713f670106cae
Merge: a62038f 69771bb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 21 15:48:06 2010 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Prev by Author: [or-cvs] [tor/release-0.2.2] Merge remote branch 'public/bug2190_021' into maint-0.2.1
Next by Author: [or-cvs] [tor/release-0.2.2] Merge remote branch 'public/bug2060' into maint-0.2.2
Previous by thread: [or-cvs] [tor/release-0.2.2] Don't call flush_pending_log_callbacks while logging LD_NOCB messages.
Next by thread: [or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Index(es):
- Author
- Thread