]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Wed, 28 Jun 2017 17:48:52 +0000 (13:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 28 Jun 2017 17:48:52 +0000 (13:48 -0400)
1  2 
src/or/entrynodes.c
src/or/router.c

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