Merge remote-tracking branch 'teor/fallbacks-201602-v2'
commit69fc025e956f5a87db0860a1be54e6d3612c8074
authorNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:51:22 +0000 (28 15:51 +0100)
committerNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:51:22 +0000 (28 15:51 +0100)
treeefb5de801e05e8f02de37a907065f4ce7c083f2f
parent88ad2f5fb215d30d07e2433ee1d9acc7bb19d0ef
parente2202146d16af22502fd4166ac926fefa6528dff
Merge remote-tracking branch 'teor/fallbacks-201602-v2'