[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13811_025'

[nickm at torproject.org]

commit d7776315df8ec12a496127a5d5c3c9fcbec9c092
Merge: 45b911b c10ff26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 23 13:02:37 2014 -0500

    Merge remote-tracking branch 'public/bug13811_025'

 changes/bug13811    |    6 ++++++
 src/or/addressmap.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)