commit 647a90b9b3bcec5d6cac766e6b3756d6ff1302ce Merge: e405918 d93516c Author: Nick Mathewson nickm@torproject.org Date: Sun Dec 21 13:37:40 2014 -0500

Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'

changes/bug14002-osx-transproxy-ipfw-pf | 4 ++++ src/or/config.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)