commit 5e0404265fd0e1f297b4b587419870fcd58a9d7c Merge: 63234b1 0c3c475 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 8 12:11:37 2013 -0400

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

changes/bug9596 | 4 ++++ src/or/policies.h | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-)