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

[arma at torproject.org]

commit 4c06a804d946de238e2d6a0b1a7dd655b0d82ccc
Merge: 0712d60 2ecee3f
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Oct 23 17:26:07 2012 -0400

    Merge branch 'maint-0.2.3'

 changes/bug7190   |    6 ++++++
 src/or/policies.c |    5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)