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

[or-cvs] [tor/master] Merge branch 'bug2332_part2' into maint-0.2.1

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/master] Merge branch 'bug2332_part2' into maint-0.2.1
From: nickm@xxxxxxxxxxxxxx
Date: Sat, 15 Jan 2011 17:49:24 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Sat, 15 Jan 2011 12:49:34 -0500
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit c2aa2db8b5f523c62712d3c4944b1a4c4c514b1c
Merge: 8f11642 bd67b23
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Jan 15 12:43:02 2011 -0500

    Merge branch 'bug2332_part2' into maint-0.2.1

Prev by Author: [or-cvs] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Next by Author: [or-cvs] [tor/master] Merge remote branch 'origin/maint-0.2.2'
Previous by thread: [or-cvs] [tor/maint-0.2.2] Merge branch 'bug2332_part2' into maint-0.2.1
Next by thread: [or-cvs] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Index(es):
- Author
- Thread