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

[or-cvs] [tor/master] Merge maint-0.2.2: do not take manpage change from bug2450.

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [tor/master] Merge maint-0.2.2: do not take manpage change from bug2450.
From: nickm@xxxxxxxxxxxxxx
Date: Thu, 3 Feb 2011 19:01:40 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 03 Feb 2011 14:01:58 -0500
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit cb9ac0336d0acd935aa45dfc89f02594551a24da
Merge: 912b76a e94ee58
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 3 14:00:59 2011 -0500

    Merge maint-0.2.2: do not take manpage change from bug2450.

Prev by Author: [or-cvs] [tor/master] Merge remote branch 'sebastian/bug2450' into maint-0.2.2
Next by Author: [or-cvs] [tor/maint-0.2.2] Enable ASLR and permanent DEP for Windows executables
Previous by thread: [or-cvs] [tor/master] Remove country codes from EntryNodes manpage entry
Next by thread: [or-cvs] [tor/maint-0.2.2] changes file for ASLR/DEP build on windows
Index(es):
- Author
- Thread