Skip to content
Snippets Groups Projects
Commit 9ef2cd77 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

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

Conflicts:
	src/or/connection_edge.c

Conflicted on a router->node transition; fix was easy.
parents 7ca16aff 2bf0e747
Branches
Tags
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment