torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source 
The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
	src/or/circuitbuild.c
	src/or/command.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/dirserv.c
	src/or/relay.c
	src/or/rendservice.c
	src/or/routerlist.c
This commit is contained in:
Nick Mathewson
2011-05-30 15:41:46 -04:00
parent 21de9d46e2 7f0fb8e608
commit fa1d47293b
19 changed files with 339 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug3045
+6
View File
@@ -0,0 +1,6 @@
o Minor features:
- Revise most log messages that refer to nodes by nickname to
instead use the "$key=nickname at address" format. This should be
more useful, especially since nicknames are less and less likely
to be unique. Fixes bug 3045.