 Nick Mathewson
|
6802499413
Merge branch 'bug3228_squashed' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
f08f0e9dde
Reinit keys at the start of options_act().
|
14 years ago |
|
Nick Mathewson
|
4b57ec6e5e
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
16cfca501f
Merge branch 'bug1297a' into maint-0.2.2
|
14 years ago |
 Robert Ransom
|
8fc02a8e0c
Use the normal four-hop CBT for client intro circuits
|
14 years ago |
|
Robert Ransom
|
112d204fad
Set timestamp_dirty on HS circuits as circuit_expire_building requires
|
14 years ago |
 Roger Dingledine
|
6917728637
Merge branch 'maint-0.2.2'
|
14 years ago |
|
Roger Dingledine
|
5f182ea10e
answer an XXX nickm asked in aa950e6c4
|
14 years ago |
|
Nick Mathewson
|
e676db656d
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
1f18b5a5d5
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
f43aceb0f1
Fix typo in changes/bug2574. Thanks, rransom
|
14 years ago |
|
Nick Mathewson
|
285cf998bc
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
c319949550
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
ee72557d52
Merge branch 'bug2574' into maint-0.2.1
|
14 years ago |
|
Nick Mathewson
|
8e09f7cf10
Fix a -Wunused-but-set-variable instance in master
|
14 years ago |
|
Nick Mathewson
|
42b15a0aaa
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
0e1fad648d
Don't try to build descriptors when router_get_advertised_or_port()==0
|
14 years ago |
|
Nick Mathewson
|
95ac3ea594
Don't build descriptors if ORPort auto is set and we have no OR listener
|
14 years ago |
|
Nick Mathewson
|
be76850995
Work correctly if your nameserver is ::1
|
14 years ago |
|
Nick Mathewson
|
a5232e0c4c
Fix GCC 4.6's new -Wunused-but-set-variable warnings.
|
14 years ago |
|
Nick Mathewson
|
57810c333a
Remove the -F option from tor-resolve.
|
14 years ago |
|
Nick Mathewson
|
6f200b61b7
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Robert Ransom
|
6cac100b13
Unbreak the build on libevent 1.x systems
|
14 years ago |
|
Nick Mathewson
|
2527acb2dc
Merge remote-tracking branch 'origin/maint-0.2.2'
|
14 years ago |
|
Nick Mathewson
|
b80a8bba19
Merge branch 'feature3049-v2' into maint-0.2.2
|
14 years ago |
|
Nick Mathewson
|
1e69c60dcc
The first argument for a libevent callback should be evutil_socket_t
|
14 years ago |
|
Nick Mathewson
|
93b699e1ea
Appease make check-spaces wrt procmon.h
|
14 years ago |
|
Nick Mathewson
|
cfeafe5e77
Use a 64-bit type to hold sockets on win64.
|
14 years ago |
|
Roger Dingledine
|
1ba1bdee4b
naked constants are ugly
|
14 years ago |
|
Roger Dingledine
|
6b54edef4f
finish a comment nickm started in 8ebceeb3
|
14 years ago |
