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

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

Conflicts:
	src/common/tortls.c

Conflict on comment near use of the new OPENSSL_V macro
parents ef0bc7f8 2da0efb5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment