Merge remote-tracking branch 'arma/ticket5528'

Conflicts:
	src/or/router.c
	src/test/test_dir.c
This commit is contained in:
Nick Mathewson
2014-03-05 12:44:40 -05:00
16 changed files with 67 additions and 87 deletions
+4
View File
@@ -0,0 +1,4 @@
o Code simplifications and refactoring:
- Get rid of router->address, since in all cases it was just the
string representation of router->addr. Resolves ticket 5528.