]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug4645'
authorNick Mathewson <nickm@torproject.org>
Wed, 2 Apr 2014 01:49:01 +0000 (21:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 Apr 2014 01:49:01 +0000 (21:49 -0400)
commitfc9e84062b73535b63bb3cf555604b1acbcc4c61
tree8c47eb7b3f82bb6bf00c19481f058372fa68fd84
parentdfc32177d9ec3b8a639d6831ca4bc92c4f273dcb
parent408bd98e79196933e447cbc68c73ecffebaf5a19
Merge remote-tracking branch 'public/bug4645'

Conflicts:
src/or/dirserv.c
src/common/address.c
src/common/address.h
src/or/config.c
src/or/directory.c
src/or/dirserv.c
src/test/test_addr.c