commit 7b51667d638242b9e47bdd0d4357596c380f7c94 Merge: b266329 b08cfc6 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jan 11 11:05:31 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug14142-parse-virtual-addr | 7 +++++++ src/or/addressmap.c | 6 ++++++ 2 files changed, 13 insertions(+)