[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18454'

[nickm at torproject.org]

commit 656e23171d64885c1bea95403768386ee369e949
Merge: 36ac47b 9f98e65
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 11 10:22:41 2016 -0500

    Merge remote-tracking branch 'teor/bug18454'

 changes/bug18454     | 8 ++++++++
 src/common/address.c | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)