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

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

Use the "ours" strategy so that we retain 4aff97cf, which maint-0.2.3
just reverted.
parents 35e19b94 45439bfc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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