[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 661bd3fe714f0c9986eb872eb8eb5d72b2efc195
Merge: 1c64f99 88859b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 17:10:16 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 src/or/config.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)