|  David Goulet | 33c99cf565
							
							hs-v2: Demote log warning to info when we don't have a consensus | 7 years ago | 
				
					
						|  Nick Mathewson | 8f689e0eb2
							
							Merge branch 'maint-0.3.3' into maint-0.3.4 | 7 years ago | 
				
					
						|  Nick Mathewson | 7e406ec40f
							
							Merge branch 'maint-0.3.4' | 7 years ago | 
				
					
						|  Nick Mathewson | 281854bab7
							
							If options_act() fails, restore the previous value of global_options | 7 years ago | 
				
					
						|  Nick Mathewson | 0e4fcd3996
							
							Merge branch 'nss_27664' | 7 years ago | 
				
					
						|  Nick Mathewson | e43ae24e7d
							
							Merge branch 'nss_27451' | 7 years ago | 
				
					
						|  Nick Mathewson | dbb0abc9f1
							
							Tweak changes file: call this a major feature. | 7 years ago | 
				
					
						|  Nick Mathewson | 1ca03633fe
							
							Tweak message; only log it on a relay. | 7 years ago | 
				
					
						|  Nick Mathewson | 12320e7f3e
							
							Merge remote-tracking branch 'neel/b21530' | 7 years ago | 
				
					
						|  Nick Mathewson | 82b1282772
							
							Merge branch 'maint-0.3.3' into maint-0.3.4 | 7 years ago | 
				
					
						|  Nick Mathewson | 0582f678e7
							
							Merge branch 'maint-0.3.4' | 7 years ago | 
				
					
						|  Nick Mathewson | 84e3ada71b
							
							Merge remote-tracking branch 'onionk/rust-protokeyword1-035' | 7 years ago | 
				
					
						|  Nick Mathewson | bb012d7941
							
							Merge remote-tracking branch 'tor-github/pr/329' | 7 years ago | 
				
					
						|  Nick Mathewson | b67f3b751a
							
							Merge branch 'ticket27247' | 7 years ago | 
				
					
						|  Nick Mathewson | 88c9730817
							
							Re-order includes to expose intptr_t to tor_api_internal.h | 7 years ago | 
				
					
						|  cypherpunks | bf9dc697fa
							
							Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035 | 7 years ago | 
				
					
						|  cypherpunks | 574d59c640
							
							Merge branch 'rust-protokeyword1' into rust-protokeyword1-034 | 7 years ago | 
				
					
						|  Neel Chauhan | 2c093c96b2
							
							Add log message for Tor being non-exit by default | 7 years ago | 
				
					
						|  Nick Mathewson | d8280216c0
							
							Include torint.h in socketpair.c for intptr_t definition. | 7 years ago | 
				
					
						|  Nick Mathewson | 92357a07bd
							
							Fix a 32-bit off_t/size_t warning in crypto_rsa.c | 7 years ago | 
				
					
						|  Nick Mathewson | 83b8a76f0c
							
							Fix a shadowed-global warning in geoip.c | 7 years ago | 
				
					
						|  Nick Mathewson | b943721b2a
							
							Merge branch 'bug27224_take2_squashed' | 7 years ago | 
				
					
						|  rl1987 | 1e77376e1a
							
							Avoid calling node_get_all_orports() from node_is_a_configured_bridge() | 7 years ago | 
				
					
						|  Nick Mathewson | 874eca6a8c
							
							Add a test case with a matching ip but mismatched identity. | 7 years ago | 
				
					
						|  rl1987 | 9741921094
							
							Unit tests for ticket 27224. | 7 years ago | 
				
					
						|  Nick Mathewson | fae7f96e7b
							
							Explain PIE/PIC rationale for 23846. | 7 years ago | 
				
					
						|  Nick Mathewson | eaf7d16826
							
							Merge branch 'ticket23846' | 7 years ago | 
				
					
						|  Nick Mathewson | 85aba48a66
							
							Merge branch 'bug26470_032' | 7 years ago | 
				
					
						|  Mike Perry | e86593c40d
							
							Ticket #27678: Changes file. | 7 years ago | 
				
					
						|  Mike Perry | efa2075670
							
							Ticket #27678: Emit CIRC_BW events immediately for dropped cells. | 7 years ago |