|  Nick Mathewson | c93ecb8189
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 1db5081ba1
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 8cc147aa83
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  David Goulet | 15a699462d
							
							dirauth: Add bastet to the default authorities | 8 years ago | 
				
					
						|  Nick Mathewson | 783e458c07
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | c958fda6e2
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 9a1b385462
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | 74e8fd22c9
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 132e2f69b1
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 6f87a85897
							
							Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | 35574d4a9a
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | fcaf3335b4
							
							Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | d29e4c0597
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 68dea082e7
							
							Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 5d219ecf98
							
							Update Longclaw's IP address; fixes 23592. | 8 years ago | 
				
					
						|  Nick Mathewson | 91c17ffbd6
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | f7f55acae9
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 43ebe54a24
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 2e21493a88
							
							add missing subcategory in changes file | 8 years ago | 
				
					
						|  Nick Mathewson | d6bdec1595
							
							Merge branch 'maint-0.2.5' into maint-0.2.8 | 8 years ago | 
				
					
						|  Nick Mathewson | ad7db10770
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 2984d99165
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Karsten Loesing | b9d9b16b76
							
							Update geoip and geoip6 to the October 4 2017 database. | 8 years ago | 
				
					
						|  Nick Mathewson | f7222e6d8c
							
							Clear outbuf_flushlen when we clear a connection's outbuf | 8 years ago | 
				
					
						|  David Goulet | dc5c9af6c3
							
							hs: Avoid possible double circuit close on error | 8 years ago | 
				
					
						|  Nick Mathewson | 2c93be80d9
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago | 
				
					
						|  Nick Mathewson | 746410fb24
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  teor | 8e52c46581
							
							Remove longclaw's IPv6 address, as it will soon change | 8 years ago | 
				
					
						|  Nick Mathewson | 23c5259a38
							
							Merge branch 'maint-0.2.9' into maint-0.3.0 | 8 years ago | 
				
					
						|  Nick Mathewson | 42e12a3537
							
							Merge branch 'maint-0.2.8' into maint-0.2.9 | 8 years ago |