commit 79fdfd52313cfb4032d70cf668da8060220a580a Merge: f727ebc 0219589 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 7 10:23:30 2015 -0500 Merge remote-tracking branch 'teor/exitpolicy-multicast' changes/bug17763 | 5 +++++ src/common/address.c | 2 +- src/common/address.h | 2 +- src/or/policies.c | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-)