commit b55e31aeb453875728295de664383b12e76fefdc Merge: 42ff326 eeedc5c Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 11 16:32:58 2011 -0400

Merge remote-tracking branch 'rransom-tor/bug3427'

changes/bug3427 | 4 ++++ src/or/Makefile.am | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)