 Nick Mathewson
|
57189acd6f
# This is a combination of 2 commits.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
03a4e97c76
Merge remote-tracking branch 'origin/maint-0.2.5'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
1525eeeb49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
86105a4009
Check ENABLE_TOR2WEB_MODE before any tor2webmode code
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
96211bcf71
Merge branch 'bug9321_rerebase'
|
%!s(int64=9) %!d(string=hai) anos |
 George Kadianakis
|
5c34a53068
Don't exit if we can't find the GuardfractionFile when booting.
|
%!s(int64=9) %!d(string=hai) anos |
|
George Kadianakis
|
f4a63f8eab
Parse GuardFraction info from consensuses and votes.
|
%!s(int64=9) %!d(string=hai) anos |
|
George Kadianakis
|
5ee48d47a7
Parse Guardfraction file and apply results to routerstatuses.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
9bf6da1861
Merge remote-tracking branch 'public/feature_13822'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
2fe139473d
No, coverity, this is not a memory leak. 1268065
|
%!s(int64=9) %!d(string=hai) anos |
 Sina Rabbani
|
8e61d38cf1
Faravahar's New IP Address as of 2/20/2015
|
%!s(int64=9) %!d(string=hai) anos |
 Sebastian Hahn
|
3bcdb26267
Call cpu_init if we change to being a relay
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
caf28519d9
Merge branch 'bug12844'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
8b82f6261e
Search-and-replace to regain coding style in wake of 13822.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
4beb830953
Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
03563f4723
Fix an unused-variable warning.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
79c7625e38
Merge branch 'feature13864_squashed'
|
%!s(int64=9) %!d(string=hai) anos |
 rl1987
|
fe328d192e
Allow reading torrc from stdin.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
fac8d40886
Merge remote-tracking branch 'public/prop227_v2'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
d1e52d9a2a
Correctly handle OutboundBindAddress again.
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
4c1a779539
Restrict unix: addresses to control and socks for now
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
204374f7d9
Remove SocksSocket; it's now spelled differently thanks to 14451
|
%!s(int64=9) %!d(string=hai) anos |
 David Goulet
|
bf3fb55c47
Support unix: prefix in port configuration
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
034e2788f8
whitespace fixes
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
23fc1691b6
Merge branch 'better_workqueue_v3_squashed'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
e7e33d4b04
Merge branch 'bug14084'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
da423532f7
Merge branch 'ticket14254_squashed'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
78c53eff85
Fix SocksSocket 0. That was easy!
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
63765399eb
Merge remote-tracking branch 'public/ticket13037'
|
%!s(int64=9) %!d(string=hai) anos |
|
Nick Mathewson
|
31838bd783
changes suggested by weasel
|
%!s(int64=9) %!d(string=hai) anos |
