]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug20203_027_squashed' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Thu, 22 Sep 2016 19:17:00 +0000 (15:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 22 Sep 2016 19:17:00 +0000 (15:17 -0400)
1  2 
src/or/circuitlist.c
src/or/relay.c

Simple merge
diff --cc src/or/relay.c
Simple merge