[tor-commits] [tor/master] Merge remote-tracking branch 'tvdw/from-the-archive'

commit 082bfd3b55792a1b56dabf06dcb486bbc1417b8e Merge: f4221a8 5d322e6 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 6 13:44:13 2015 -0500 Merge remote-tracking branch 'tvdw/from-the-archive' src/or/addressmap.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)