user/mikeperry/torbutton, branch bug13766 Mike's Torbutton repository fixup! Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. 2015-03-25T03:44:41+00:00 Mike Perry mikeperry-git@torproject.org 2015-03-25T03:44:41+00:00 e5d7a99ef34cc81d5bf39dbbd15afd96da4f5f16 More log and comment cleanups. 
More log and comment cleanups.
fixup! Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. 2015-03-25T03:34:12+00:00 Mike Perry mikeperry-git@torproject.org 2015-03-25T03:34:12+00:00 266c25d4d21ef1914350b305820c2687fe6a4e48 Actually use the right return value... 
Actually use the right return value...
Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. 2015-03-25T03:27:20+00:00 Mike Perry mikeperry-git@torproject.org 2015-03-25T03:27:20+00:00 1ec2c3640b2519f10456ec51729a90d3498e793c This will allow us to raise the circuit dirty timeout value for all other circs. 
This will allow us to raise the circuit dirty timeout value for all other
circs.
Merge remote-tracking branch 'gk/bug_9387_v12' 2015-03-24T21:16:00+00:00 Mike Perry mikeperry-git@torproject.org 2015-03-24T21:16:00+00:00 2acdf4d9ac039aee11351631a79ab0437dc4e39a 






Merge remote-tracking branch 'arthur/14937+7'
2015-03-24T15:41:45+00:00

Georg Koppen
gk@torproject.org

2015-03-24T15:41:45+00:00

5ac0bb12aaceb954d124e1e65cd47c37e28fcaa7












Bug 9387: Security slider 1.0
2015-03-23T09:20:01+00:00

Georg Koppen
gk@torproject.org

2015-03-23T09:20:01+00:00

398eba8d5e2bf22afe41dbdd97044598ffbc2dd8












Bug 14937: Show meek and flashproxy bridges in tor circuit display
2015-03-21T23:33:14+00:00

Arthur Edelstein
arthuredelstein@gmail.com

2015-03-21T23:32:07+00:00

c6321626cf04db74a8c08af19331c686757adc85












Merge remote-tracking branch 'mikeperry/bug13650'
2015-03-20T21:21:54+00:00

Mike Perry
mikeperry-git@torproject.org

2015-03-20T21:21:54+00:00

55d3976e8dbfe7e0d969faf50722e6b0e5f869ac












Bug 9387: Version 0.9 of the Security Slider
2015-03-20T14:54:31+00:00

Georg Koppen
gk@torproject.org

2015-03-20T14:54:09+00:00

430ccaa1596e03e3ea0a36c51c4623fe8ff67d52

Showing a notification to the user hinting at our new security slider
to adjust the security settings.





Showing a notification to the user hinting at our new security slider
to adjust the security settings.







Bug 9387: Version 0.8 of the Security Slider
2015-03-20T08:13:41+00:00

Georg Koppen
gk@torproject.org

2015-03-20T08:13:41+00:00

35970c68d6af10fdec19189aae64d76e048acc4e

This is the first version of the slider that contains explanatory
strings to make it more clear to the user what is changed and why.

Special thanks to Mike Perry for helping out getting this part of the
UI in good shape.





This is the first version of the slider that contains explanatory
strings to make it more clear to the user what is changed and why.

Special thanks to Mike Perry for helping out getting this part of the
UI in good shape.